Menu
▾
▴
zenoss-commit — svn commit list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(65) |
Mar
(276) |
Apr
(544) |
May
(638) |
Jun
(225) |
Jul
(204) |
Aug
(294) |
Sep
(532) |
Oct
(506) |
Nov
(324) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(208) |
Feb
(225) |
Mar
(248) |
Apr
(388) |
May
(222) |
Jun
(47) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@ze...> - 2008-04-15 23:37:07
|
Author: cluther Date: 2008-04-15 19:37:09 -0400 (Tue, 15 Apr 2008) New Revision: 9012 Added: trunk/inst/externallibs/nagios-plugins-1.4.5.all.patch01 Log: * Fixes #2967: Expose -i parameter for check_fping to set ping interval. Added: trunk/inst/externallibs/nagios-plugins-1.4.5.all.patch01 |
|
From: <sv...@ze...> - 2008-04-15 20:09:33
|
Author: noel
Date: 2008-04-15 16:09:39 -0400 (Tue, 15 Apr 2008)
New Revision: 9011
Modified:
trunk/Products/ZenEvents/skins/zenevents/eventClassInstStatus.pt
trunk/Products/ZenEvents/skins/zenevents/eventClassStatus.pt
Log:
*fixes#556 replaces the rainbow macro with the new horizontal one
Modified: trunk/Products/ZenEvents/skins/zenevents/eventClassInstStatus.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/eventClassInstStatus.pt 2008-04-15 20:09:11 UTC (rev 9010)
+++ trunk/Products/ZenEvents/skins/zenevents/eventClassInstStatus.pt 2008-04-15 20:09:39 UTC (rev 9011)
@@ -24,7 +24,7 @@
<tr>
<td class="tableheader">Events</td>
<td class="tablevalues">
- <table metal:use-macro="here/rainbows/macros/eventrainbow"></table>
+ <table metal:use-macro="here/rainbows/macros/horizontal"></table>
</td>
<th class="tableheader" align="left">Total Event Count</th>
<td class="tablevalues" align="center" tal:content="here/getStatus">
Modified: trunk/Products/ZenEvents/skins/zenevents/eventClassStatus.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/eventClassStatus.pt 2008-04-15 20:09:11 UTC (rev 9010)
+++ trunk/Products/ZenEvents/skins/zenevents/eventClassStatus.pt 2008-04-15 20:09:39 UTC (rev 9011)
@@ -12,7 +12,7 @@
<tr>
<td class="tableheader" align="left">Events</td>
<td class="tablevalues" align="left">
- <table metal:use-macro="here/rainbows/macros/eventrainbow" />
+ <table metal:use-macro="here/rainbows/macros/horizontal" />
</td>
<th class="tableheader" align="left">SubClass Count</th>
<td class="tablevalues" tal:content="here/countChildren">100</td>
|
|
From: <sv...@ze...> - 2008-04-15 20:09:06
|
Author: chris
Date: 2008-04-15 16:09:11 -0400 (Tue, 15 Apr 2008)
New Revision: 9010
Modified:
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/JBossDemo.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/JmxClient.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/TomcatDemo.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcClient.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcDemo.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/DelayedCall.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Injector.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Processor.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Reactor.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CallFactory.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/ConfigurationCall.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CountDownLatchObserver.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/HeartbeatCall.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/MultiValueAttributeCall.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/OperationCall.java
trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/SingleValueAttributeCall.java
Log:
* switch from log4j to commons-logging
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/JBossDemo.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/JBossDemo.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/JBossDemo.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -17,7 +17,8 @@
import java.util.Map;
import java.util.Arrays;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -75,7 +76,7 @@
private JmxClient _client;
// logger
- private static final Logger _logger = Logger.getLogger(JBossDemo.class);
+ private static final Log _logger = LogFactory.getLog(JBossDemo.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/JmxClient.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/JmxClient.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/JmxClient.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -30,7 +30,8 @@
import javax.management.MBeanServerConnection;
import javax.management.MalformedObjectNameException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -65,7 +66,7 @@
private boolean _connected;
// logger
- private static final Logger _logger = Logger.getLogger(JmxClient.class);
+ private static final Log _logger = LogFactory.getLog(JmxClient.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/TomcatDemo.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/TomcatDemo.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/jmx/TomcatDemo.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -17,7 +17,8 @@
import java.util.Map;
import java.util.Arrays;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -71,7 +72,7 @@
private JmxClient _client;
// logger
- private static final Logger _logger = Logger.getLogger(TomcatDemo.class);
+ private static final Log _logger = LogFactory.getLog(TomcatDemo.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcClient.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcClient.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcClient.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -24,7 +24,8 @@
import org.apache.xmlrpc.XmlRpcException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -48,7 +49,7 @@
private String _name;
// logger
- private static final Logger _logger = Logger.getLogger(XmlRpcClient.class);
+ private static final Log _logger = LogFactory.getLog(XmlRpcClient.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcDemo.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcDemo.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcDemo.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -20,7 +20,8 @@
import org.apache.xmlrpc.XmlRpcException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -56,7 +57,7 @@
private XmlRpcClient _client;
// logger
- private static final Logger _logger = Logger.getLogger(XmlRpcDemo.class);
+ private static final Log _logger = LogFactory.getLog(XmlRpcDemo.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/DelayedCall.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/DelayedCall.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/DelayedCall.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -18,7 +18,8 @@
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -45,7 +46,7 @@
private String _hostname;
// logger
- private static final Logger _logger = Logger.getLogger(DelayedCall.class);
+ private static final Log _logger = LogFactory.getLog(DelayedCall.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Injector.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Injector.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Injector.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -21,7 +21,8 @@
import java.util.HashSet;
import java.util.ArrayList;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -50,7 +51,7 @@
private Set<Integer> _callIds;
// logger
- private static final Logger _logger = Logger.getLogger(Injector.class);
+ private static final Log _logger = LogFactory.getLog(Injector.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Processor.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Processor.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Processor.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -25,7 +25,8 @@
import org.apache.xmlrpc.XmlRpcException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import static com.zenoss.zenpacks.zenjmx.OptionsFactory.*;
@@ -59,7 +60,7 @@
private CountDownLatch _latch;
// logger
- private static final Logger _logger = Logger.getLogger(Processor.class);
+ private static final Log _logger = LogFactory.getLog(Processor.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Reactor.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Reactor.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Reactor.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -39,7 +39,8 @@
import com.zenoss.zenpacks.zenjmx.call.CountDownLatchObserver;
import com.zenoss.zenpacks.zenjmx.call.HeartbeatCall;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.xmlrpc.XmlRpcException;
@@ -131,7 +132,7 @@
private static Reactor _instance;
// logger
- private static final Logger _logger = Logger.getLogger(Reactor.class);
+ private static final Log _logger = LogFactory.getLog(Reactor.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CallFactory.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CallFactory.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CallFactory.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -18,7 +18,8 @@
import static com.zenoss.zenpacks.zenjmx.call.SingleValueAttributeCall.*;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -38,7 +39,7 @@
public static final String DATASOURCE_ID = "id";
// logger
- private static final Logger _logger = Logger.getLogger(CallFactory.class);
+ private static final Log _logger = LogFactory.getLog(CallFactory.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/ConfigurationCall.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/ConfigurationCall.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/ConfigurationCall.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -21,7 +21,8 @@
import org.apache.xmlrpc.XmlRpcException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -39,8 +40,7 @@
private XmlRpcClient _client;
// logger
- private static final Logger _logger =
- Logger.getLogger(ConfigurationCall.class);
+ private static final Log _logger = LogFactory.getLog(ConfigurationCall.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CountDownLatchObserver.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CountDownLatchObserver.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CountDownLatchObserver.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -16,7 +16,8 @@
import java.net.InetAddress;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import com.zenoss.zenpacks.zenjmx.Configuration;
import com.zenoss.zenpacks.zenjmx.Reactor;
@@ -39,8 +40,8 @@
private CountDownLatch _latch;
// logger
- private static final Logger _logger =
- Logger.getLogger(CountDownLatchObserver.class);
+ private static final Log _logger =
+ LogFactory.getLog(CountDownLatchObserver.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/HeartbeatCall.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/HeartbeatCall.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/HeartbeatCall.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -19,7 +19,8 @@
import com.zenoss.xmlrpc.XmlRpcClient;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import static com.zenoss.zenpacks.zenjmx.OptionsFactory.*;
@@ -42,7 +43,7 @@
private String _component;
// logger
- private static final Logger _logger = Logger.getLogger(HeartbeatCall.class);
+ private static final Log _logger = LogFactory.getLog(HeartbeatCall.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/MultiValueAttributeCall.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/MultiValueAttributeCall.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/MultiValueAttributeCall.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -22,7 +22,8 @@
import static com.zenoss.zenpacks.zenjmx.call.SingleValueAttributeCall.*;
import static com.zenoss.zenpacks.zenjmx.call.CallFactory.*;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -49,8 +50,8 @@
private List<String> _keys;
// logger
- private static final Logger _logger =
- Logger.getLogger(MultiValueAttributeCall.class);
+ private static final Log _logger =
+ LogFactory.getLog(MultiValueAttributeCall.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/OperationCall.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/OperationCall.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/OperationCall.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -23,7 +23,8 @@
import static com.zenoss.zenpacks.zenjmx.call.JmxCall.*;
import static com.zenoss.zenpacks.zenjmx.call.CallFactory.*;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -64,7 +65,7 @@
private List<String> _keys;
// logger
- private static final Logger _logger = Logger.getLogger(OperationCall.class);
+ private static final Log _logger = LogFactory.getLog(OperationCall.class);
/**
Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/SingleValueAttributeCall.java
===================================================================
--- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/SingleValueAttributeCall.java 2008-04-15 19:47:26 UTC (rev 9009)
+++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/SingleValueAttributeCall.java 2008-04-15 20:09:11 UTC (rev 9010)
@@ -20,7 +20,8 @@
import static com.zenoss.zenpacks.zenjmx.call.JmxCall.*;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -44,8 +45,8 @@
private String _attrName;
// logger
- private static final Logger _logger =
- Logger.getLogger(SingleValueAttributeCall.class);
+ private static final Log _logger =
+ LogFactory.getLog(SingleValueAttributeCall.class);
/**
* Creates a SingleAttributeCall
|
|
From: <sv...@ze...> - 2008-04-15 19:47:21
|
Author: rak Date: 2008-04-15 15:47:26 -0400 (Tue, 15 Apr 2008) New Revision: 9009 Added: sandboxen/rak/zenoss-core/vendor/trunk-20080415/ Removed: sandboxen/rak/zenoss-core/vendor/trunk-2008-0415/ Log: Trunk as of 20080415 Copied: sandboxen/rak/zenoss-core/vendor/trunk-20080415 (from rev 9008, sandboxen/rak/zenoss-core/vendor/trunk-2008-0415) |
|
From: <sv...@ze...> - 2008-04-15 19:46:44
|
Author: rak Date: 2008-04-15 15:46:52 -0400 (Tue, 15 Apr 2008) New Revision: 9008 Added: sandboxen/rak/zenoss-core/vendor/trunk-2008-0415/ Removed: sandboxen/rak/zenoss-core/vendor/current/ Log: Trunk as of 20080415 Copied: sandboxen/rak/zenoss-core/vendor/trunk-2008-0415 (from rev 9007, sandboxen/rak/zenoss-core/vendor/current) |
|
From: <sv...@ze...> - 2008-04-15 19:45:33
|
Author: chris Date: 2008-04-15 15:45:38 -0400 (Tue, 15 Apr 2008) New Revision: 9007 Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Main.java Log: * switch from log4j to commons-logging Modified: trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Main.java =================================================================== --- trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Main.java 2008-04-15 19:45:24 UTC (rev 9006) +++ trunk/zenpacks/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Main.java 2008-04-15 19:45:38 UTC (rev 9007) @@ -34,7 +34,8 @@ import org.apache.xmlrpc.XmlRpcException; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import static com.zenoss.zenpacks.zenjmx.OptionsFactory.*; @@ -66,7 +67,7 @@ private Configuration _config; // logger - private static final Logger _logger = Logger.getLogger(Main.class); + private static final Log _logger = LogFactory.getLog(Main.class); /** |
|
From: <sv...@ze...> - 2008-04-15 19:45:17
|
Author: chris Date: 2008-04-15 15:45:24 -0400 (Tue, 15 Apr 2008) New Revision: 9006 Added: trunk/zenpacks/ZenJMX/src/main/resources/commons-logging.properties Log: * added. delegate to log4j as an logging implementation (rather than jdk 1.4) Added: trunk/zenpacks/ZenJMX/src/main/resources/commons-logging.properties |
|
From: <sv...@ze...> - 2008-04-15 19:44:56
|
Author: chris
Date: 2008-04-15 15:44:59 -0400 (Tue, 15 Apr 2008)
New Revision: 9005
Modified:
trunk/zenpacks/ZenJMX/pom.xml
Log:
* pull in commons-logging. it's better to use that than log4j directly
Modified: trunk/zenpacks/ZenJMX/pom.xml
===================================================================
--- trunk/zenpacks/ZenJMX/pom.xml 2008-04-15 19:44:40 UTC (rev 9004)
+++ trunk/zenpacks/ZenJMX/pom.xml 2008-04-15 19:44:59 UTC (rev 9005)
@@ -41,6 +41,12 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
|
Author: rak
Date: 2008-04-15 15:44:40 -0400 (Tue, 15 Apr 2008)
New Revision: 9004
Added:
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/tests/testMigrate.py
sandboxen/rak/zenoss-core/trunk/inst/docs/INSTALL_DEB-ETCH.txt
sandboxen/rak/zenoss-core/trunk/inst/docs/INSTALL_Mac.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/ApacheMonitorDataSource.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/libexec/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/libexec/check_apache.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/ConvertApacheMonitorDataSources.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/ApacheMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/ApacheMonitor/editApacheMonitorDataSource.pt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellCPUMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellDeviceMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellPCIMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/skins/DellMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/daemons/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/DnsMonitorDataSource.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/BaseClass.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/ConvertDnsMonitorDataSources.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/modeler/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/modeler/plugins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/reports/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/DnsMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/DnsMonitor/editDnsMonitorDataSource.pt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/HPCPUMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/HPDeviceMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/skins/HPMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/daemons/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/HttpMonitorDataSource.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/BaseClass.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/ConvertHttpMonitorDataSources.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/modeler/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/modeler/plugins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/reports/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/HttpMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/HttpMonitor/editHttpMonitorDataSource.pt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/MySqlMonitorDataSource.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/libexec/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/libexec/check_mysql_stats.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/BaseClass.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/ConvertMySqlMonitorDataSources.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/RenamePasswordProperty.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/MySqlMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/MySqlMonitor/editMySqlMonitorDataSource.pt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/setup.py
Removed:
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/ApacheMonitorDataSource.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/libexec/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/libexec/check_apache.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/ConvertApacheMonitorDataSources.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/ApacheMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/ApacheMonitor/editApacheMonitorDataSource.pt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellCPUMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellDeviceMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellPCIMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/skins/DellMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DellMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/daemons/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/DnsMonitorDataSource.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/BaseClass.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/ConvertDnsMonitorDataSources.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/modeler/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/modeler/plugins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/reports/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/DnsMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/DnsMonitor/editDnsMonitorDataSource.pt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/HPCPUMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/HPDeviceMap.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/skins/HPMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HPMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/daemons/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/HttpMonitorDataSource.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/BaseClass.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/ConvertHttpMonitorDataSources.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/modeler/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/modeler/plugins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/reports/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/HttpMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/HttpMonitor/editHttpMonitorDataSource.pt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/setup.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/MySqlMonitorDataSource.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/libexec/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/libexec/check_mysql_stats.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/BaseClass.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/ConvertMySqlMonitorDataSources.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/RenamePasswordProperty.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/objects/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/objects/objects.xml
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/MySqlMonitor/
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/MySqlMonitor/editMySqlMonitorDataSource.pt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/setup.py
Modified:
sandboxen/rak/zenoss-core/trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/Commandable.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/DataRoot.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/OperatingSystem.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ServiceOrganizer.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/UserSettings.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZVersion.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPack.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPackLoader.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPackTemplate/setup.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/data/menus.xml
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/migrate/Migrate.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/migrate/fixManufacturersLocation.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/migrate/removeStatusMonitor.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/migrate/zpsitecustomize.py
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/addDevice.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor_grid.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/leftPane.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/skins/zenmodel/zenoss.css
sandboxen/rak/zenoss-core/trunk/Products/ZenModel/tests/testGoogleMaps.py
sandboxen/rak/zenoss-core/trunk/Products/ZenUtils/EggifyZenPack.py
sandboxen/rak/zenoss-core/trunk/Products/ZenUtils/ZenPackCmd.py
sandboxen/rak/zenoss-core/trunk/Products/ZenUtils/zenpack.py
sandboxen/rak/zenoss-core/trunk/Products/ZenWidgets/ZenossPortlets/GoogleMapsPortlet.js
sandboxen/rak/zenoss-core/trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt
sandboxen/rak/zenoss-core/trunk/Products/ZenWin/modeler/plugins/zenoss/wmi/WinServiceMap.py
sandboxen/rak/zenoss-core/trunk/Products/ZenWin/zenwin.py
sandboxen/rak/zenoss-core/trunk/bin/runtests
sandboxen/rak/zenoss-core/trunk/zenpacks/DellMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/HPMonitor/__init__.py
sandboxen/rak/zenoss-core/trunk/zenpacks/MySqlMonitor/README.txt
sandboxen/rak/zenoss-core/trunk/zenpacks/ZenJMX/daemons/zenjmx
Log:
Merged latest trunk into rak branch
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt 2008-04-15 19:44:40 UTC (rev 9004)
@@ -37,11 +37,12 @@
<tal:block tal:repeat="view batch">
<tr tal:define="odd repeat/view/odd"
tal:attributes="class python:test(odd, 'odd', 'even')">
- <td class="tablevalues"
- tal:condition="python:here.checkRemotePerm('Change Event Views',
- here)">
+ <td class="tablevalues">
+ <tal:block tal:condition="python:here.checkRemotePerm('Change Event Views',
+ here)" >
<input type="checkbox" name="ids:list"
tal:attributes="value view/getId"/>
+ </tal:block>
<a tal:attributes="href view/getPrimaryUrlPath"
tal:content="view/getId">view</a>
</td>
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/Commandable.py
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/Commandable.py 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/Commandable.py 2008-04-15 19:44:40 UTC (rev 9004)
@@ -261,7 +261,7 @@
'''
# Looks like firefox renders progressive output more smoothly
# if each line is stuck into a table row.
- startLine = '<tr><td class="tablevalues">'
+ startLine = '<tr><td class="commandoutput">'
endLine = '</td></tr>\n'
if out:
if not isinstance(lines, list):
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/DataRoot.py
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/DataRoot.py 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/DataRoot.py 2008-04-15 19:44:40 UTC (rev 9004)
@@ -593,7 +593,7 @@
'modDate': info[stat.ST_MTIME],
'modDateFormatted': datetime.datetime.fromtimestamp(
info[stat.ST_MTIME]).strftime(
- '%a %b %d, %Y %X %p'),
+ '%c'),
})
fileInfo.sort(key=operator.itemgetter('modDate'))
return fileInfo
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/OperatingSystem.py
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/OperatingSystem.py 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/OperatingSystem.py 2008-04-15 19:44:40 UTC (rev 9004)
@@ -46,12 +46,15 @@
)
_relations = Software._relations + (
- ("interfaces", ToManyCont(ToOne, "Products.ZenModel.IpInterface", "os")),
+ ("interfaces", ToManyCont(ToOne,
+ "Products.ZenModel.IpInterface", "os")),
("routes", ToManyCont(ToOne, "Products.ZenModel.IpRouteEntry", "os")),
("ipservices", ToManyCont(ToOne, "Products.ZenModel.IpService", "os")),
- ("winservices", ToManyCont(ToOne, "Products.ZenModel.WinService", "os")),
+ ("winservices", ToManyCont(ToOne,
+ "Products.ZenModel.WinService", "os")),
("processes", ToManyCont(ToOne, "Products.ZenModel.OSProcess", "os")),
- ("filesystems", ToManyCont(ToOne, "Products.ZenModel.FileSystem", "os")),
+ ("filesystems", ToManyCont(ToOne,
+ "Products.ZenModel.FileSystem", "os")),
("software", ToManyCont(ToOne, "Products.ZenModel.Software", "os")),
)
@@ -131,7 +134,8 @@
def deleteDeviceComponents(self, context, componentNames=[], REQUEST=None):
"""Delete device components"""
if not componentNames: return self()
- if type(componentNames) in types.StringTypes: componentNames = (componentNames,)
+ if type(componentNames) in types.StringTypes:
+ componentNames = (componentNames,)
for componentName in componentNames:
dc = context._getOb(componentName)
dc.manage_deleteComponent()
@@ -141,27 +145,32 @@
def unlockDeviceComponents(self, context, componentNames=[], REQUEST=None):
"""Unlock device components"""
if not componentNames: return self()
- if type(componentNames) in types.StringTypes: componentNames = (componentNames,)
+ if type(componentNames) in types.StringTypes:
+ componentNames = (componentNames,)
for componentName in componentNames:
dc = context._getOb(componentName)
dc.unlock()
if REQUEST:
return self.callZenScreen(REQUEST)
- def lockDeviceComponentsFromDeletion(self, context, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockDeviceComponentsFromDeletion(self, context, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock device components from deletion"""
if not componentNames: return self()
- if type(componentNames) in types.StringTypes: componentNames = (componentNames,)
+ if type(componentNames) in types.StringTypes:
+ componentNames = (componentNames,)
for componentName in componentNames:
dc = context._getOb(componentName)
dc.lockFromDeletion(sendEventWhenBlocked)
if REQUEST:
return self.callZenScreen(REQUEST)
- def lockDeviceComponentsFromUpdates(self, context, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockDeviceComponentsFromUpdates(self, context, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock device components from updates"""
if not componentNames: return self()
- if type(componentNames) in types.StringTypes: componentNames = (componentNames,)
+ if type(componentNames) in types.StringTypes:
+ componentNames = (componentNames,)
for componentName in componentNames:
dc = context._getOb(componentName)
dc.lockFromUpdates(sendEventWhenBlocked)
@@ -175,7 +184,8 @@
manage_addIpInterface(self.interfaces, id, userCreated)
if REQUEST:
REQUEST['message'] = 'IpInterface created'
- REQUEST['RESPONSE'].redirect(self.interfaces._getOb(id).absolute_url())
+ REQUEST['RESPONSE'].redirect(
+ self.interfaces._getOb(id).absolute_url())
return self.callZenScreen(REQUEST)
def deleteIpInterfaces(self, componentNames=[], REQUEST=None):
@@ -183,6 +193,7 @@
self.deleteDeviceComponents(self.interfaces, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpInterfaces deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockIpInterfaces(self, componentNames=[], REQUEST=None):
@@ -190,26 +201,30 @@
self.unlockDeviceComponents(self.interfaces, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpInterfaces unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpInterfacesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpInterfacesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpInterfaces from deletion"""
- self.lockDeviceComponentsFromDeletion(self.interfaces, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.interfaces, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpInterfaces locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpInterfacesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpInterfacesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpInterfaces from updates"""
- self.lockDeviceComponentsFromUpdates(self.interfaces, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.interfaces, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpInterfaces locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def addWinService(self,
- className,
- userCreated,
- REQUEST=None):
+ def addWinService(self, className, userCreated, REQUEST=None):
"""Add an WinService.
"""
org = self.dmd.Services.WinService
@@ -234,6 +249,7 @@
self.deleteDeviceComponents(self.winservices, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'WinServices deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockWinServices(self, componentNames=[], REQUEST=None):
@@ -241,20 +257,27 @@
self.unlockDeviceComponents(self.winservices, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'WinServices unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockWinServicesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockWinServicesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock WinServices from deletion"""
- self.lockDeviceComponentsFromDeletion(self.winservices, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.winservices, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'WinServices locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockWinServicesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockWinServicesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock WinServices from updates"""
- self.lockDeviceComponentsFromUpdates(self.winservices, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.winservices, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'WinServices locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def getSubOSProcessClassesGen(self, REQUEST=None):
@@ -275,6 +298,7 @@
self.deleteDeviceComponents(self.processes, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'OSProcesses deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockOSProcesses(self, componentNames=[], REQUEST=None):
@@ -282,20 +306,27 @@
self.unlockDeviceComponents(self.processes, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'OSProcesses unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockOSProcessesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockOSProcessesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock OSProcesses from deletion"""
- self.lockDeviceComponentsFromDeletion(self.processes, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.processes, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'OSProcesses locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockOSProcessesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockOSProcessesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock OSProcesses from updates"""
- self.lockDeviceComponentsFromUpdates(self.processes, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.processes, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'OSProcesses locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def addIpService(self, className, protocol, userCreated, REQUEST=None):
@@ -324,6 +355,7 @@
self.deleteDeviceComponents(self.ipservices, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpServices deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockIpServices(self, componentNames=[], REQUEST=None):
@@ -331,20 +363,27 @@
self.unlockDeviceComponents(self.ipservices, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpServices unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpServicesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpServicesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpServices from deletion"""
- self.lockDeviceComponentsFromDeletion(self.ipservices, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.ipservices, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpServices locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpServicesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpServicesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpServices from updates"""
- self.lockDeviceComponentsFromUpdates(self.ipservices, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.ipservices, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpServices locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def addFileSystem(self, id, userCreated, REQUEST=None):
@@ -354,7 +393,8 @@
manage_addFileSystem(self.filesystems, id, userCreated)
if REQUEST:
REQUEST['message'] = 'FileSystem created'
- REQUEST['RESPONSE'].redirect(self.filesystems._getOb(fsid).absolute_url())
+ REQUEST['RESPONSE'].redirect(
+ self.filesystems._getOb(fsid).absolute_url())
return self.callZenScreen(REQUEST)
def deleteFileSystems(self, componentNames=[], REQUEST=None):
@@ -362,6 +402,7 @@
self.deleteDeviceComponents(self.filesystems, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'FileSystems deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockFileSystems(self, componentNames=[], REQUEST=None):
@@ -369,31 +410,31 @@
self.unlockDeviceComponents(self.filesystems, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'FileSystems unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockFileSystemsFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockFileSystemsFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock FileSystems from deletion"""
- self.lockDeviceComponentsFromDeletion(self.filesystems, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.filesystems, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'FileSystems locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockFileSystemsFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockFileSystemsFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock FileSystems from updates"""
- self.lockDeviceComponentsFromUpdates(self.filesystems, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.filesystems, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'FileSystems locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def addIpRouteEntry(self,
- dest,
- routemask,
- nexthopid,
- interface,
- routeproto,
- routetype,
- userCreated,
- REQUEST=None):
+ def addIpRouteEntry(self, dest, routemask, nexthopid, interface,
+ routeproto, routetype, userCreated, REQUEST=None):
"""Add an IpRouteEntry.
"""
manage_addIpRouteEntry(self.routes,
@@ -414,6 +455,7 @@
self.deleteDeviceComponents(self.routes, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpRouteEntries deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockIpRouteEntries(self, componentNames=[], REQUEST=None):
@@ -421,20 +463,28 @@
self.unlockDeviceComponents(self.routes, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpRouteEntries unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpRouteEntriesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpRouteEntriesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpRouteEntries from deletion"""
- self.lockDeviceComponentsFromDeletion(self.routes, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.routes, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpRouteEntries locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpRouteEntriesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpRouteEntriesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpRouteEntries from updates"""
- self.lockDeviceComponentsFromUpdates(self.routes, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.routes, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
- REQUEST['message'] = 'IpRouteEntries locked from updates and deletion'
+ REQUEST['message'] = \
+ 'IpRouteEntries locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
InitializeClass(OperatingSystem)
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ServiceOrganizer.py
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ServiceOrganizer.py 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ServiceOrganizer.py 2008-04-15 19:44:40 UTC (rev 9004)
@@ -12,6 +12,7 @@
###########################################################################
import types
+import simplejson
import logging
log = logging.getLogger("zen.ServiceOrganizer")
@@ -253,7 +254,7 @@
liveSearchList.append('%s [%s]' % (srv.id, srv.description))
else:
liveSearchList.append(srv.id)
- return liveSearchList
+ return simplejson.dumps(liveSearchList)
def parseServiceLiveSearchString(self, str):
""" Parse a string of id and description from a live search
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/UserSettings.py
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/UserSettings.py 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/UserSettings.py 2008-04-15 19:44:40 UTC (rev 9004)
@@ -488,7 +488,7 @@
},
{'name' : 'Event Views',
'action' : 'editEventViews',
- 'permissions' : (ZEN_CHANGE_EVENT_VIEWS,),
+ 'permissions' : (ZEN_CHANGE_SETTINGS,),
},
{'name' : 'Alerting Rules',
'action' : 'editActionRules',
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZVersion.py
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZVersion.py 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZVersion.py 2008-04-15 19:44:40 UTC (rev 9004)
@@ -10,4 +10,4 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
###########################################################################
-VERSION="2.1.91"
+VERSION="2.1.92"
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPack.py
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPack.py 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPack.py 2008-04-15 19:44:40 UTC (rev 9004)
@@ -74,6 +74,42 @@
def recover(self, pack): pass
+class ZenPackDataSourceMigrateBase(ZenPackMigration):
+ """
+ Base class for ZenPack migrate steps that need to switch classes of
+ datasources and reindex them. This is frequently done in migrate
+ scripts for 2.2 when ZenPacks are migrated to python eggs.
+ """
+ # dsClass is the actual class of the datasource provided by this ZenPack
+ dsClass = None
+ # These are the names of the module and the class of the datasource as
+ # provided by previous versios of this ZenPack. If these are provided
+ # then any instances of them will be converted to instances of dsClass.
+ oldDsModuleName = ''
+ oldDsClassName = ''
+ # If reIndex is True then any instances of dsClass are reindexed.
+ reIndex = False
+
+ def migrate(self, pack):
+ if self.oldDsModuleName and self.oldDsClassName and self.dsClass:
+ try:
+ exec('import %s' % self.oldDsModuleName)
+ oldClass = eval('%s.%s' % (self.oldDsModuleName,
+ self.oldDsClassName))
+ except ImportError:
+ # The old-style code no longer exists in Products,
+ # so we assume the migration has already happened.
+ oldClass = None
+
+ from Products.ZenModel.RRDTemplate import YieldAllRRDTemplates
+ for template in YieldAllRRDTemplates(pack.dmd, None):
+ for ds in template.datasources():
+ if oldClass and self.dsClass and isinstance(ds, oldClass):
+ ds.__class__ = self.dsClass
+ if self.reIndex and isinstance(ds, self.dsClass):
+ ds.reIndex()
+
+
class ZenPack(ZenModelRM):
'''The root of all ZenPacks: has no implementation,
but sits here to be the target of the Relation'''
@@ -87,15 +123,11 @@
url = ''
license = ''
compatZenossVers = ''
+ prevZenPackName = ''
# New-style zenpacks (eggs) have this set to True when they are
# first installed
eggPack = False
-
- # # isDevelopment indicates that the zenpack can be exported
- # # and that objects can be added to it. Also allows editing on
- # # viewPackDetail.pt
- # development = False
requires = () # deprecated
@@ -148,28 +180,43 @@
def install(self, app):
- #self.stopDaemons()
+ self.stopDaemons()
for loader in self.loaders:
loader.load(self, app)
self.createZProperties(app)
- #self.startDaemons()
+ self.migrate()
+ self.startDaemons()
def upgrade(self, app):
- #self.stopDaemons()
+ """
+ This is essentially an install() call except that a different method
+ is called on the loaders.
+ NB: Newer ZenPacks (egg style) do not use this upgrade method. Instead
+ the proper method is to remove(leaveObjects=True) and install again.
+ See ZenPackCmd.InstallDistAsZenPack().
+ """
+ self.stopDaemons()
for loader in self.loaders:
loader.upgrade(self, app)
self.createZProperties(app)
self.migrate()
- #self.startDaemons()
+ self.startDaemons()
def remove(self, app, leaveObjects=False):
- #self.stopDaemons()
+ """
+ This prepares the ZenPack for removal but does not actually remove
+ the instance from ZenPackManager.packs This is sometimes called during
+ the course of an upgrade where the loaders' unload methods need to
+ be run.
+ """
+ self.stopDaemons()
for loader in self.loaders:
- loader.unload(self, app)
- self.removeZProperties(app)
- self.removeCatalogedObjects(app)
+ loader.unload(self, app, leaveObjects)
+ if not leaveObjects:
+ self.removeZProperties(app)
+ self.removeCatalogedObjects(app)
def migrate(self):
@@ -534,6 +581,7 @@
Stop all the daemons provided by this pack.
Called before an upgrade or a removal of the pack.
"""
+ return
for d in self.getDaemonNames():
self.About.doDaemonAction(d, 'stop')
@@ -543,6 +591,7 @@
Start all the daemons provided by this pack.
Called after an upgrade or an install of the pack.
"""
+ return
for d in self.getDaemonNames():
self.About.doDaemonAction(d, 'start')
Modified: sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPackLoader.py
===================================================================
--- sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPackLoader.py 2008-04-15 19:36:06 UTC (rev 9003)
+++ sandboxen/rak/zenoss-core/trunk/Products/ZenModel/ZenPackLoader.py 2008-04-15 19:44:40 UTC (rev 9004)
@@ -57,7 +57,7 @@
"""Load things from the ZenPack and put it
into the app"""
- def unload(self, pack, app):
+ def unload(self, pack, app, leaveObjects=False):
"""Remove things from Zenoss defined in the ZenPack"""
def list(self, pack, app):
@@ -101,7 +101,9 @@
parser.parse(open(filename))
- def unload(self, pack, app):
+ def unload(self, pack, app, leaveObjects=False):
+ if leaveObjects:
+ return
from Products.ZenRelations.Exceptions import ObjectNotFound
dmd = app.zport.dmd
objs = pack.packables()
@@ -145,6 +147,7 @@
rl.loadDirectory(pack.path('reports'))
def upgrade(self, pack, app):
+ self.unload(pack, app)
self.load(pack, app)
def list(self, pack, unused):
@@ -194,10 +197,11 @@
def upgrade(self, pack, app):
+ self.unload(pack, app)
self.load(pack, app)
- def unload(self, pack, unused):
+ def unload(self, pack, unused, leaveObjects=False):
for fs in findFiles(pack, 'daemons', filter=self.filter):
try:
os.remove(self.binPath(fs))
@@ -225,6 +229,7 @@
os.chmod(fs, 0755)
def upgrade(self, pack, app):
+ self.unload(pack, app)
self.load(pack, app)
def list(self, pack, unused):
@@ -248,6 +253...
[truncated message content] |
|
From: <sv...@ze...> - 2008-04-15 19:36:02
|
Author: ecn Date: 2008-04-15 15:36:06 -0400 (Tue, 15 Apr 2008) New Revision: 9003 Modified: trunk/inst/rpm/el4.deps trunk/inst/rpm/el5.deps trunk/inst/rpm/fc6.deps Log: * remove dependency on python2.3 Modified: trunk/inst/rpm/el4.deps =================================================================== --- trunk/inst/rpm/el4.deps 2008-04-15 19:33:58 UTC (rev 9002) +++ trunk/inst/rpm/el4.deps 2008-04-15 19:36:06 UTC (rev 9003) @@ -1,8 +1,6 @@ -BuildRequires: python-devel >= 2.3.4 \ BuildRequires: MySQL-devel-standard >= 5.0.22 \ BuildRequires: MySQL-shared-standard >= 5.0.22 \ BuildRequires: MySQL-server-standard >= 5.0.22 \ Requires: MySQL-server-standard >= 5.0.22 \ Requires: MySQL-client-standard >= 5.0.22 \ -Requires: python >= 2.3.4 \ Requires: net-snmp-utils \ Modified: trunk/inst/rpm/el5.deps =================================================================== --- trunk/inst/rpm/el5.deps 2008-04-15 19:33:58 UTC (rev 9002) +++ trunk/inst/rpm/el5.deps 2008-04-15 19:36:06 UTC (rev 9003) @@ -1,7 +1,5 @@ -BuildRequires: python-devel >= 2.3.4 \ BuildRequires: mysql-devel >= 5.0.22 \ BuildRequires: mysql >= 5.0.22 \ -Requires: python >= 2.3.4 \ Requires: mysql-server >= 5.0.22 \ Requires: mysql >= 5.0.22 \ Requires: python >= 2.3.4 \ Modified: trunk/inst/rpm/fc6.deps =================================================================== --- trunk/inst/rpm/fc6.deps 2008-04-15 19:33:58 UTC (rev 9002) +++ trunk/inst/rpm/fc6.deps 2008-04-15 19:36:06 UTC (rev 9003) @@ -1,7 +1,5 @@ -BuildRequires: python-devel >= 2.3.4 \ BuildRequires: mysql-devel >= 5.0.22 \ BuildRequires: mysql >= 5.0.22 \ -Requires: python >= 2.3.4 \ Requires: mysql-server >= 5.0.22 \ Requires: mysql >= 5.0.22 \ Requires: net-snmp-utils \ |
|
From: <sv...@ze...> - 2008-04-15 19:33:56
|
Author: rak Date: 2008-04-15 15:33:58 -0400 (Tue, 15 Apr 2008) New Revision: 9002 Added: sandboxen/rak/zenoss-core/vendor/current/ Log: Merging latest trunk Copied: sandboxen/rak/zenoss-core/vendor/current (from rev 9001, trunk) |
|
From: <sv...@ze...> - 2008-04-15 18:49:28
|
Author: sjakesch
Date: 2008-04-15 14:49:20 -0400 (Tue, 15 Apr 2008)
New Revision: 9001
Modified:
trunk/Products/ZenModel/Commandable.py
trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt
trunk/Products/ZenModel/skins/zenmodel/zenoss.css
Log:
print command output as fixed width font
Modified: trunk/Products/ZenModel/Commandable.py
===================================================================
--- trunk/Products/ZenModel/Commandable.py 2008-04-15 14:22:15 UTC (rev 9000)
+++ trunk/Products/ZenModel/Commandable.py 2008-04-15 18:49:20 UTC (rev 9001)
@@ -261,7 +261,7 @@
'''
# Looks like firefox renders progressive output more smoothly
# if each line is stuck into a table row.
- startLine = '<tr><td class="tablevalues">'
+ startLine = '<tr><td class="commandoutput">'
endLine = '</td></tr>\n'
if out:
if not isinstance(lines, list):
Modified: trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt 2008-04-15 14:22:15 UTC (rev 9000)
+++ trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt 2008-04-15 18:49:20 UTC (rev 9001)
@@ -55,24 +55,14 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
-
<tr tal:condition="exists: request/cmd/command">
- <td class="tablevalues" valign="top">
- Command:
- <tal:block tal:content="request/cmd/command" />
- </td>
+ <td class="commandoutput" valign="top">Command: <tal:block tal:content="request/cmd/command" /></td>
</tr>
<tr tal:condition="exists: request/cmd/description">
- <td class="tablevalues" valign="top">
- Description:
- <tal:block tal:content="request/cmd/description" />
- </td>
+ <td class="commandoutput" valign="top">Description: <tal:block tal:content="request/cmd/description" /></td>
</tr>
<tr>
- <td class="tablevalues" valign="top">
- Output:
- </td>
+ <td class="commandoutput" valign="top">Output:</td>
</tr>
OUTPUT_TOKEN
Modified: trunk/Products/ZenModel/skins/zenmodel/zenoss.css
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2008-04-15 14:22:15 UTC (rev 9000)
+++ trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2008-04-15 18:49:20 UTC (rev 9001)
@@ -630,6 +630,12 @@
color: #000000;
background-color: #E0E0E0;
}
+td.commandoutput {
+ font-family: Courier New, Courier, monospace;
+ white-space:pre;
+ font-weight: normal;
+ background-color: #EEEEE;
+}
.tablevalues {
font-family: Verdana, Arial, Helvetica, sans-serif;
color: #000040;
|
|
From: <sv...@ze...> - 2008-04-15 14:22:24
|
Author: marc
Date: 2008-04-15 10:22:15 -0400 (Tue, 15 Apr 2008)
New Revision: 9000
Modified:
trunk/Products/ZenModel/OperatingSystem.py
Log:
* Fixed column width for lines over 80 chars
* Added a value to REQUEST.RESPONSE for the delete and locking methods for all the device components
* fixes #2928
Modified: trunk/Products/ZenModel/OperatingSystem.py
===================================================================
--- trunk/Products/ZenModel/OperatingSystem.py 2008-04-15 13:59:50 UTC (rev 8999)
+++ trunk/Products/ZenModel/OperatingSystem.py 2008-04-15 14:22:15 UTC (rev 9000)
@@ -46,12 +46,15 @@
)
_relations = Software._relations + (
- ("interfaces", ToManyCont(ToOne, "Products.ZenModel.IpInterface", "os")),
+ ("interfaces", ToManyCont(ToOne,
+ "Products.ZenModel.IpInterface", "os")),
("routes", ToManyCont(ToOne, "Products.ZenModel.IpRouteEntry", "os")),
("ipservices", ToManyCont(ToOne, "Products.ZenModel.IpService", "os")),
- ("winservices", ToManyCont(ToOne, "Products.ZenModel.WinService", "os")),
+ ("winservices", ToManyCont(ToOne,
+ "Products.ZenModel.WinService", "os")),
("processes", ToManyCont(ToOne, "Products.ZenModel.OSProcess", "os")),
- ("filesystems", ToManyCont(ToOne, "Products.ZenModel.FileSystem", "os")),
+ ("filesystems", ToManyCont(ToOne,
+ "Products.ZenModel.FileSystem", "os")),
("software", ToManyCont(ToOne, "Products.ZenModel.Software", "os")),
)
@@ -131,7 +134,8 @@
def deleteDeviceComponents(self, context, componentNames=[], REQUEST=None):
"""Delete device components"""
if not componentNames: return self()
- if type(componentNames) in types.StringTypes: componentNames = (componentNames,)
+ if type(componentNames) in types.StringTypes:
+ componentNames = (componentNames,)
for componentName in componentNames:
dc = context._getOb(componentName)
dc.manage_deleteComponent()
@@ -141,27 +145,32 @@
def unlockDeviceComponents(self, context, componentNames=[], REQUEST=None):
"""Unlock device components"""
if not componentNames: return self()
- if type(componentNames) in types.StringTypes: componentNames = (componentNames,)
+ if type(componentNames) in types.StringTypes:
+ componentNames = (componentNames,)
for componentName in componentNames:
dc = context._getOb(componentName)
dc.unlock()
if REQUEST:
return self.callZenScreen(REQUEST)
- def lockDeviceComponentsFromDeletion(self, context, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockDeviceComponentsFromDeletion(self, context, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock device components from deletion"""
if not componentNames: return self()
- if type(componentNames) in types.StringTypes: componentNames = (componentNames,)
+ if type(componentNames) in types.StringTypes:
+ componentNames = (componentNames,)
for componentName in componentNames:
dc = context._getOb(componentName)
dc.lockFromDeletion(sendEventWhenBlocked)
if REQUEST:
return self.callZenScreen(REQUEST)
- def lockDeviceComponentsFromUpdates(self, context, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockDeviceComponentsFromUpdates(self, context, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock device components from updates"""
if not componentNames: return self()
- if type(componentNames) in types.StringTypes: componentNames = (componentNames,)
+ if type(componentNames) in types.StringTypes:
+ componentNames = (componentNames,)
for componentName in componentNames:
dc = context._getOb(componentName)
dc.lockFromUpdates(sendEventWhenBlocked)
@@ -175,7 +184,8 @@
manage_addIpInterface(self.interfaces, id, userCreated)
if REQUEST:
REQUEST['message'] = 'IpInterface created'
- REQUEST['RESPONSE'].redirect(self.interfaces._getOb(id).absolute_url())
+ REQUEST['RESPONSE'].redirect(
+ self.interfaces._getOb(id).absolute_url())
return self.callZenScreen(REQUEST)
def deleteIpInterfaces(self, componentNames=[], REQUEST=None):
@@ -183,6 +193,7 @@
self.deleteDeviceComponents(self.interfaces, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpInterfaces deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockIpInterfaces(self, componentNames=[], REQUEST=None):
@@ -190,26 +201,30 @@
self.unlockDeviceComponents(self.interfaces, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpInterfaces unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpInterfacesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpInterfacesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpInterfaces from deletion"""
- self.lockDeviceComponentsFromDeletion(self.interfaces, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.interfaces, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpInterfaces locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpInterfacesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpInterfacesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpInterfaces from updates"""
- self.lockDeviceComponentsFromUpdates(self.interfaces, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.interfaces, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpInterfaces locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def addWinService(self,
- className,
- userCreated,
- REQUEST=None):
+ def addWinService(self, className, userCreated, REQUEST=None):
"""Add an WinService.
"""
org = self.dmd.Services.WinService
@@ -234,6 +249,7 @@
self.deleteDeviceComponents(self.winservices, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'WinServices deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockWinServices(self, componentNames=[], REQUEST=None):
@@ -241,20 +257,27 @@
self.unlockDeviceComponents(self.winservices, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'WinServices unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockWinServicesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockWinServicesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock WinServices from deletion"""
- self.lockDeviceComponentsFromDeletion(self.winservices, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.winservices, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'WinServices locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockWinServicesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockWinServicesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock WinServices from updates"""
- self.lockDeviceComponentsFromUpdates(self.winservices, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.winservices, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'WinServices locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def getSubOSProcessClassesGen(self, REQUEST=None):
@@ -275,6 +298,7 @@
self.deleteDeviceComponents(self.processes, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'OSProcesses deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockOSProcesses(self, componentNames=[], REQUEST=None):
@@ -282,20 +306,27 @@
self.unlockDeviceComponents(self.processes, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'OSProcesses unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockOSProcessesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockOSProcessesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock OSProcesses from deletion"""
- self.lockDeviceComponentsFromDeletion(self.processes, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.processes, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'OSProcesses locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockOSProcessesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockOSProcessesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock OSProcesses from updates"""
- self.lockDeviceComponentsFromUpdates(self.processes, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.processes, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'OSProcesses locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def addIpService(self, className, protocol, userCreated, REQUEST=None):
@@ -324,6 +355,7 @@
self.deleteDeviceComponents(self.ipservices, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpServices deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockIpServices(self, componentNames=[], REQUEST=None):
@@ -331,20 +363,27 @@
self.unlockDeviceComponents(self.ipservices, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpServices unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpServicesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpServicesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpServices from deletion"""
- self.lockDeviceComponentsFromDeletion(self.ipservices, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.ipservices, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpServices locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpServicesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpServicesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpServices from updates"""
- self.lockDeviceComponentsFromUpdates(self.ipservices, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.ipservices, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpServices locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def addFileSystem(self, id, userCreated, REQUEST=None):
@@ -354,7 +393,8 @@
manage_addFileSystem(self.filesystems, id, userCreated)
if REQUEST:
REQUEST['message'] = 'FileSystem created'
- REQUEST['RESPONSE'].redirect(self.filesystems._getOb(fsid).absolute_url())
+ REQUEST['RESPONSE'].redirect(
+ self.filesystems._getOb(fsid).absolute_url())
return self.callZenScreen(REQUEST)
def deleteFileSystems(self, componentNames=[], REQUEST=None):
@@ -362,6 +402,7 @@
self.deleteDeviceComponents(self.filesystems, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'FileSystems deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockFileSystems(self, componentNames=[], REQUEST=None):
@@ -369,31 +410,31 @@
self.unlockDeviceComponents(self.filesystems, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'FileSystems unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockFileSystemsFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockFileSystemsFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock FileSystems from deletion"""
- self.lockDeviceComponentsFromDeletion(self.filesystems, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.filesystems, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'FileSystems locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockFileSystemsFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockFileSystemsFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock FileSystems from updates"""
- self.lockDeviceComponentsFromUpdates(self.filesystems, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.filesystems, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'FileSystems locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def addIpRouteEntry(self,
- dest,
- routemask,
- nexthopid,
- interface,
- routeproto,
- routetype,
- userCreated,
- REQUEST=None):
+ def addIpRouteEntry(self, dest, routemask, nexthopid, interface,
+ routeproto, routetype, userCreated, REQUEST=None):
"""Add an IpRouteEntry.
"""
manage_addIpRouteEntry(self.routes,
@@ -414,6 +455,7 @@
self.deleteDeviceComponents(self.routes, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpRouteEntries deleted'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
def unlockIpRouteEntries(self, componentNames=[], REQUEST=None):
@@ -421,20 +463,28 @@
self.unlockDeviceComponents(self.routes, componentNames, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpRouteEntries unlocked'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpRouteEntriesFromDeletion(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpRouteEntriesFromDeletion(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpRouteEntries from deletion"""
- self.lockDeviceComponentsFromDeletion(self.routes, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromDeletion(self.routes, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
REQUEST['message'] = 'IpRouteEntries locked from deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
- def lockIpRouteEntriesFromUpdates(self, componentNames=[], sendEventWhenBlocked=None, REQUEST=None):
+ def lockIpRouteEntriesFromUpdates(self, componentNames=[],
+ sendEventWhenBlocked=None, REQUEST=None):
"""Lock IpRouteEntries from updates"""
- self.lockDeviceComponentsFromUpdates(self.routes, componentNames, sendEventWhenBlocked, REQUEST)
+ self.lockDeviceComponentsFromUpdates(self.routes, componentNames,
+ sendEventWhenBlocked, REQUEST)
if REQUEST:
- REQUEST['message'] = 'IpRouteEntries locked from updates and deletion'
+ REQUEST['message'] = \
+ 'IpRouteEntries locked from updates and deletion'
+ REQUEST['RESPONSE'].redirect(self.absolute_url())
return self.callZenScreen(REQUEST)
InitializeClass(OperatingSystem)
|
|
From: <sv...@ze...> - 2008-04-15 13:59:58
|
Author: abray Date: 2008-04-15 09:59:50 -0400 (Tue, 15 Apr 2008) New Revision: 8999 Added: trunk/inst/docs/INSTALL_DEB-ETCH.txt trunk/inst/docs/INSTALL_Mac.txt Log: Fixed various instructions tickets Added: trunk/inst/docs/INSTALL_DEB-ETCH.txt Added: trunk/inst/docs/INSTALL_Mac.txt |
Author: jstevens Date: 2008-04-15 01:04:28 -0400 (Tue, 15 Apr 2008) New Revision: 8998 Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/README.txt trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/ApacheMonitorDataSource.py trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/__init__.py trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/libexec/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/libexec/check_apache.py trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/ConvertApacheMonitorDataSources.py trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/__init__.py trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/objects/objects.xml trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/ApacheMonitor/ trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/ApacheMonitor/editApacheMonitorDataSource.pt trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/setup.py trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/README.txt trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellCPUMap.py trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellDeviceMap.py trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellPCIMap.py trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/objects/objects.xml trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/skins/DellMonitor/ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.DellMonitor/setup.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/daemons/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/DnsMonitorDataSource.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/__init__.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/BaseClass.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/ConvertDnsMonitorDataSources.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/__init__.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/modeler/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/modeler/plugins/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/objects/objects.xml trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/reports/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/DnsMonitor/ trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/DnsMonitor/editDnsMonitorDataSource.pt trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/setup.py trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/README.txt trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/HPCPUMap.py trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/HPDeviceMap.py trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/objects/objects.xml trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/skins/HPMonitor/ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.HPMonitor/setup.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/daemons/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/HttpMonitorDataSource.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/__init__.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/BaseClass.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/ConvertHttpMonitorDataSources.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/__init__.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/modeler/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/modeler/plugins/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/objects/objects.xml trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/reports/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/HttpMonitor/ trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/HttpMonitor/editHttpMonitorDataSource.pt trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/setup.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/README.txt trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/MySqlMonitorDataSource.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/__init__.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/libexec/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/libexec/check_mysql_stats.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/BaseClass.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/ConvertMySqlMonitorDataSources.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/RenamePasswordProperty.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/__init__.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/objects/objects.xml trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/MySqlMonitor/ trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/MySqlMonitor/editMySqlMonitorDataSource.pt trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/setup.py Log: refs #2883 * first pass at eggification of core zenpacks Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/README.txt Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/ApacheMonitorDataSource.py Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/datasources/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/libexec/check_apache.py Property changes on: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/libexec/check_apache.py ___________________________________________________________________ Name: svn:executable + * Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/ConvertApacheMonitorDataSources.py Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/migrate/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/objects/objects.xml Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/ApacheMonitor/skins/ApacheMonitor/editApacheMonitorDataSource.pt Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.ApacheMonitor/setup.py Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/README.txt Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellCPUMap.py Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellDeviceMap.py Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/modeler/plugins/DellPCIMap.py Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/objects/objects.xml Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/setup.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/DnsMonitorDataSource.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/datasources/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/BaseClass.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/ConvertDnsMonitorDataSources.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/migrate/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/objects/objects.xml Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/DnsMonitor/skins/DnsMonitor/editDnsMonitorDataSource.pt Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.DnsMonitor/setup.py Added: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/README.txt Added: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/HPCPUMap.py Added: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/modeler/plugins/HPDeviceMap.py Added: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/objects/objects.xml Added: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/setup.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/HttpMonitorDataSource.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/datasources/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/BaseClass.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/ConvertHttpMonitorDataSources.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/migrate/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/objects/objects.xml Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/HttpMonitor/skins/HttpMonitor/editHttpMonitorDataSource.pt Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.HttpMonitor/setup.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/README.txt Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/MySqlMonitorDataSource.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/datasources/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/libexec/check_mysql_stats.py Property changes on: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/libexec/check_mysql_stats.py ___________________________________________________________________ Name: svn:executable + * Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/BaseClass.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/ConvertMySqlMonitorDataSources.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/RenamePasswordProperty.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/migrate/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/objects/objects.xml Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/MySqlMonitor/skins/MySqlMonitor/editMySqlMonitorDataSource.pt Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.MySqlMonitor/setup.py |
|
From: <sv...@ze...> - 2008-04-15 04:57:49
|
Author: jstevens
Date: 2008-04-15 00:57:56 -0400 (Tue, 15 Apr 2008)
New Revision: 8997
Modified:
trunk/zenpacks/DellMonitor/__init__.py
trunk/zenpacks/HPMonitor/__init__.py
Log:
Addeding a method to the ZenPack.remove() method
Modified: trunk/zenpacks/DellMonitor/__init__.py
===================================================================
--- trunk/zenpacks/DellMonitor/__init__.py 2008-04-15 03:30:00 UTC (rev 8996)
+++ trunk/zenpacks/DellMonitor/__init__.py 2008-04-15 04:57:56 UTC (rev 8997)
@@ -32,9 +32,9 @@
ZenPackBase.upgrade(self, app)
self.setupCollectorPlugins(app.zport.dmd)
- def remove(self, app):
+ def remove(self, app, leaveObjects=False):
self.cleanupOurPlugins(app.zport.dmd)
- ZenPackBase.remove(self, app)
+ ZenPackBase.remove(self, app, leaveObjects)
def setupCollectorPlugins(self, dmd):
Modified: trunk/zenpacks/HPMonitor/__init__.py
===================================================================
--- trunk/zenpacks/HPMonitor/__init__.py 2008-04-15 03:30:00 UTC (rev 8996)
+++ trunk/zenpacks/HPMonitor/__init__.py 2008-04-15 04:57:56 UTC (rev 8997)
@@ -32,11 +32,10 @@
ZenPackBase.upgrade(self, app)
self.setupCollectorPlugins(app.zport.dmd)
- def remove(self, app):
+ def remove(self, app, leaveObjects=False):
self.cleanupOurPlugins(app.zport.dmd)
- ZenPackBase.remove(self, app)
+ ZenPackBase.remove(self, app, leaveObjects)
-
def setupCollectorPlugins(self, dmd):
self.cleanupOldPlugins(dmd)
|
|
From: <sv...@ze...> - 2008-04-15 03:29:53
|
Author: jstevens
Date: 2008-04-14 23:30:00 -0400 (Mon, 14 Apr 2008)
New Revision: 8996
Modified:
trunk/Products/ZenModel/ZenPack.py
trunk/Products/ZenModel/ZenPackLoader.py
trunk/Products/ZenModel/ZenPackTemplate/setup.py
trunk/Products/ZenUtils/EggifyZenPack.py
trunk/Products/ZenUtils/ZenPackCmd.py
trunk/Products/ZenUtils/zenpack.py
Log:
refs #2919
* When upgrading from old-style to new-style (python egg) zenpacks the upgrade code better handles transfering packables from old to new zenpack
* When upgrading old to new style the old one is removed correctly even if it has a different id (the previous id is specified as metadata in the egg.)
* Better deletion of removed/upgraded zenpack directiors/eggs.
Modified: trunk/Products/ZenModel/ZenPack.py
===================================================================
--- trunk/Products/ZenModel/ZenPack.py 2008-04-15 03:25:27 UTC (rev 8995)
+++ trunk/Products/ZenModel/ZenPack.py 2008-04-15 03:30:00 UTC (rev 8996)
@@ -74,6 +74,42 @@
def recover(self, pack): pass
+class ZenPackDataSourceMigrateBase(ZenPackMigration):
+ """
+ Base class for ZenPack migrate steps that need to switch classes of
+ datasources and reindex them. This is frequently done in migrate
+ scripts for 2.2 when ZenPacks are migrated to python eggs.
+ """
+ # dsClass is the actual class of the datasource provided by this ZenPack
+ dsClass = None
+ # These are the names of the module and the class of the datasource as
+ # provided by previous versios of this ZenPack. If these are provided
+ # then any instances of them will be converted to instances of dsClass.
+ oldDsModuleName = ''
+ oldDsClassName = ''
+ # If reIndex is True then any instances of dsClass are reindexed.
+ reIndex = False
+
+ def migrate(self, pack):
+ if self.oldDsModuleName and self.oldDsClassName and self.dsClass:
+ try:
+ exec('import %s' % self.oldDsModuleName)
+ oldClass = eval('%s.%s' % (self.oldDsModuleName,
+ self.oldDsClassName))
+ except ImportError:
+ # The old-style code no longer exists in Products,
+ # so we assume the migration has already happened.
+ oldClass = None
+
+ from Products.ZenModel.RRDTemplate import YieldAllRRDTemplates
+ for template in YieldAllRRDTemplates(pack.dmd, None):
+ for ds in template.datasources():
+ if oldClass and self.dsClass and isinstance(ds, oldClass):
+ ds.__class__ = self.dsClass
+ if self.reIndex and isinstance(ds, self.dsClass):
+ ds.reIndex()
+
+
class ZenPack(ZenModelRM):
'''The root of all ZenPacks: has no implementation,
but sits here to be the target of the Relation'''
@@ -87,15 +123,11 @@
url = ''
license = ''
compatZenossVers = ''
+ prevZenPackName = ''
# New-style zenpacks (eggs) have this set to True when they are
# first installed
eggPack = False
-
- # # isDevelopment indicates that the zenpack can be exported
- # # and that objects can be added to it. Also allows editing on
- # # viewPackDetail.pt
- # development = False
requires = () # deprecated
@@ -148,28 +180,43 @@
def install(self, app):
- #self.stopDaemons()
+ self.stopDaemons()
for loader in self.loaders:
loader.load(self, app)
self.createZProperties(app)
- #self.startDaemons()
+ self.migrate()
+ self.startDaemons()
def upgrade(self, app):
- #self.stopDaemons()
+ """
+ This is essentially an install() call except that a different method
+ is called on the loaders.
+ NB: Newer ZenPacks (egg style) do not use this upgrade method. Instead
+ the proper method is to remove(leaveObjects=True) and install again.
+ See ZenPackCmd.InstallDistAsZenPack().
+ """
+ self.stopDaemons()
for loader in self.loaders:
loader.upgrade(self, app)
self.createZProperties(app)
self.migrate()
- #self.startDaemons()
+ self.startDaemons()
def remove(self, app, leaveObjects=False):
- #self.stopDaemons()
+ """
+ This prepares the ZenPack for removal but does not actually remove
+ the instance from ZenPackManager.packs This is sometimes called during
+ the course of an upgrade where the loaders' unload methods need to
+ be run.
+ """
+ self.stopDaemons()
for loader in self.loaders:
- loader.unload(self, app)
- self.removeZProperties(app)
- self.removeCatalogedObjects(app)
+ loader.unload(self, app, leaveObjects)
+ if not leaveObjects:
+ self.removeZProperties(app)
+ self.removeCatalogedObjects(app)
def migrate(self):
@@ -534,6 +581,7 @@
Stop all the daemons provided by this pack.
Called before an upgrade or a removal of the pack.
"""
+ return
for d in self.getDaemonNames():
self.About.doDaemonAction(d, 'stop')
@@ -543,6 +591,7 @@
Start all the daemons provided by this pack.
Called after an upgrade or an install of the pack.
"""
+ return
for d in self.getDaemonNames():
self.About.doDaemonAction(d, 'start')
Modified: trunk/Products/ZenModel/ZenPackLoader.py
===================================================================
--- trunk/Products/ZenModel/ZenPackLoader.py 2008-04-15 03:25:27 UTC (rev 8995)
+++ trunk/Products/ZenModel/ZenPackLoader.py 2008-04-15 03:30:00 UTC (rev 8996)
@@ -57,7 +57,7 @@
"""Load things from the ZenPack and put it
into the app"""
- def unload(self, pack, app):
+ def unload(self, pack, app, leaveObjects=False):
"""Remove things from Zenoss defined in the ZenPack"""
def list(self, pack, app):
@@ -101,7 +101,9 @@
parser.parse(open(filename))
- def unload(self, pack, app):
+ def unload(self, pack, app, leaveObjects=False):
+ if leaveObjects:
+ return
from Products.ZenRelations.Exceptions import ObjectNotFound
dmd = app.zport.dmd
objs = pack.packables()
@@ -145,6 +147,7 @@
rl.loadDirectory(pack.path('reports'))
def upgrade(self, pack, app):
+ self.unload(pack, app)
self.load(pack, app)
def list(self, pack, unused):
@@ -194,10 +197,11 @@
def upgrade(self, pack, app):
+ self.unload(pack, app)
self.load(pack, app)
- def unload(self, pack, unused):
+ def unload(self, pack, unused, leaveObjects=False):
for fs in findFiles(pack, 'daemons', filter=self.filter):
try:
os.remove(self.binPath(fs))
@@ -225,6 +229,7 @@
os.chmod(fs, 0755)
def upgrade(self, pack, app):
+ self.unload(pack, app)
self.load(pack, app)
def list(self, pack, unused):
@@ -248,6 +253,7 @@
os.chmod(fs, 0755)
def upgrade(self, pack, app):
+ self.unload(pack, app)
self.load(pack, app)
def list(self, pack, unused):
@@ -280,7 +286,7 @@
return self.load(pack, app)
- def unload(self, pack, app):
+ def unload(self, pack, app, leaveObjects=False):
from Products.ZenUtils.Skins import unregisterSkin
unregisterSkin(app.zport.dmd, pack.path(''))
Modified: trunk/Products/ZenModel/ZenPackTemplate/setup.py
===================================================================
--- trunk/Products/ZenModel/ZenPackTemplate/setup.py 2008-04-15 03:25:27 UTC (rev 8995)
+++ trunk/Products/ZenModel/ZenPackTemplate/setup.py 2008-04-15 03:30:00 UTC (rev 8996)
@@ -9,6 +9,7 @@
PACKAGES = []
INSTALL_REQUIRES = []
COMPAT_ZENOSS_VERS = ''
+PREV_ZENPACK_NAME = ''
# STOP_REPLACEMENTS
################################
# Zenoss will not overwrite any changes you make below here.
@@ -28,6 +29,11 @@
# this ZenPack is compatible with
compatZenossVers = COMPAT_ZENOSS_VERS,
+ # previousZenPackName is a facility for telling Zenoss that the name
+ # of this ZenPack has changed. If no ZenPack with the current name is
+ # installed then a zenpack of this name if installed will be upgraded.
+ prevZenPackName = PREV_ZENPACK_NAME,
+
# Indicate to setuptools which namespace packages the zenpack
# participates in
namespace_packages = NAMESPACE_PACKAGES,
Modified: trunk/Products/ZenUtils/EggifyZenPack.py
===================================================================
--- trunk/Products/ZenUtils/EggifyZenPack.py 2008-04-15 03:25:27 UTC (rev 8995)
+++ trunk/Products/ZenUtils/EggifyZenPack.py 2008-04-15 03:30:00 UTC (rev 8996)
@@ -57,7 +57,7 @@
os.makedirs(skinsDir)
# Install it
- ZenPackCmd.InstallEggAndZenPack(self.dmd, eggDir, develop=True)
+ ZenPackCmd.InstallEggAndZenPack(self.dmd, eggDir, link=True)
# Confirm pack is eggified
pack = self.dmd.ZenPackManager.packs._getOb(zpName, None)
Modified: trunk/Products/ZenUtils/ZenPackCmd.py
===================================================================
--- trunk/Products/ZenUtils/ZenPackCmd.py 2008-04-15 03:25:27 UTC (rev 8995)
+++ trunk/Products/ZenUtils/ZenPackCmd.py 2008-04-15 03:30:00 UTC (rev 8996)
@@ -22,6 +22,7 @@
from Products.ZenModel.ZenPack import ZenPackDependentsException
from Products.ZenModel.ZenPack import ZenPack
import Products.ZenModel.ZenPackLoader as ZPL
+import zenpack as oldzenpack
import transaction
import os, sys
import pkg_resources
@@ -310,24 +311,32 @@
for loader in (ZPL.ZPLDaemons(), ZPL.ZPLBin(), ZPL.ZPLLibExec()):
loader.load(zenPack, None)
else:
+ # Look for an installed ZenPack to be upgraded. In this case
+ # upgraded means that it is removed before the new one is installed
+ # but that its objects are not removed and the packables are
+ # copied to the new instance.
existing = dmd.ZenPackManager.packs._getOb(packName, None)
+ if not existing and zenPack.prevZenPackName:
+ existing = dmd.ZenPackManager.packs._getOb(
+ zenPack.prevZenPackName, None)
+ packables = []
if existing:
- CopyMetaDataToZenPackObject(dist, existing)
+ for p in existing.packables():
+ packables.append(p)
+ existing.packables.removeRelation(p)
if existing.isEggPack():
- existing.upgrade(dmd)
- # Remove previous dist if in a different location
+ RemoveZenPack(dmd, existing.id,
+ skipDepsCheck=False, leaveObjects=True)
else:
- # Upgrading from old-style to egg
- existing.__class__ = zenPack.__class__
- zenPack = existing
- zenPack.eggPack = True
- zenPack.upgrade(dmd)
- # Remove from Products?
- else:
- dmd.ZenPackManager.packs._setObject(packName, zenPack)
- zenPack = dmd.ZenPackManager.packs._getOb(packName)
- zenPack.install(dmd)
+ oldzenpack.RemoveZenPack(dmd, existing.id,
+ skipDepsCheck=False, leaveObjects=True)
+ dmd.ZenPackManager.packs._setObject(packName, zenPack)
+ zenPack = dmd.ZenPackManager.packs._getOb(packName)
+ zenPack.install(dmd)
+ for p in packables:
+ zenPack.packables.addRelation(p)
+
cleanupSkins(dmd)
transaction.commit()
return zenPack
@@ -460,6 +469,7 @@
if pack.author == 'UNKNOWN':
pack.author = ''
pack.compatZenossVers = info.get('compatZenossVers', '')
+ pack.prevZenPackName = info.get('prevZenPackName', '')
# Requires
pack.dependencies = {}
@@ -656,12 +666,10 @@
pass
if deleteFiles:
eggLink = './%s' % zp.eggName()
- p = subprocess.Popen(
- 'rm -rf %s' % zp.eggPath(),
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- shell=True)
- p.wait()
+ if os.path.islink(eggLink):
+ os.remove(eggLink)
+ else:
+ shutil.rmtree(eggLink)
# Looks like maybe this is not needed. at least some of the
# time the easy-install.pth file is removed by setuptools
#CleanupEasyInstallPth(eggLink)
Modified: trunk/Products/ZenUtils/zenpack.py
===================================================================
--- trunk/Products/ZenUtils/zenpack.py 2008-04-15 03:25:27 UTC (rev 8995)
+++ trunk/Products/ZenUtils/zenpack.py 2008-04-15 03:30:00 UTC (rev 8996)
@@ -26,6 +26,39 @@
import os, sys
import ZenPackCmd as EggPackCmd
+
+def RemoveZenPack(dmd, packName, log=None,
+ skipDepsCheck=False, leaveObjects=True):
+ if log:
+ log.debug('Removing Pack "%s"' % packName)
+ if not skipDepsCheck:
+ for pack in dmd.ZenPackManager.packs():
+ if packName in pack.requires:
+ if log:
+ log.error("Pack %s depends on pack %s, not removing",
+ pack.id, packName)
+ return False
+ zp = None
+ try:
+ zp = dmd.ZenPackManager.packs._getOb(packName)
+ except AttributeError, ex:
+ # Pack not in zeo, might still exist in filesystem
+ if log:
+ log.debug('No ZenPack named %s in zeo' % packName)
+ if zp:
+ zp.remove(dmd, leaveObjects=True)
+ dmd.ZenPackManager.packs._delObject(packName)
+ root = zenPath('Products', packName)
+ if log:
+ log.debug('Removing %s' % root)
+ recurse = ""
+ if os.path.isdir(root):
+ recurse = "r"
+ os.system('rm -%sf %s' % (recurse, root))
+ cleanupSkins(dmd)
+ return True
+
+
class ZenPackCmd(ZenScriptBase):
"Manage ZenPacks"
@@ -118,12 +151,21 @@
if pack.isEggPack():
return EggPackCmd.RemoveZenPack(self.dmd,
self.options.removePackName)
- self.remove(self.options.removePackName)
+ RemoveZenPack(self.dmd, self.options.removePackName, self.log)
elif self.options.list:
- for zp in self.dmd.ZenPackManager.packs():
- print('%s (%s)' % (zp.id,
- zp.isEggPack() and zp.eggPath() or zp.path()))
+ for zpId in self.dmd.ZenPackManager.packs.objectIds():
+ try:
+ zp = self.dmd.ZenPackManager.packs._getOb(zpId, None)
+ except AttributeError:
+ zp = None
+ if not zp:
+ desc = 'broken'
+ elif zp.isEggPack():
+ desc = zp.eggPath()
+ else:
+ desc = zp.path()
+ print('%s (%s)' % (zpId, desc))
transaction.commit()
@@ -195,31 +237,6 @@
return
transaction.commit()
- def remove(self, packName):
- self.log.debug('Removing Pack "%s"' % packName)
- for pack in self.dmd.ZenPackManager.packs():
- if packName in pack.requires:
- self.log.error("Pack %s depends on pack %s, not removing",
- pack.id, packName)
- return
- zp = None
- try:
- zp = self.dmd.ZenPackManager.packs._getOb(packName)
- except AttributeError, ex:
- # Pack not in zeo, might still exist in filesystem
- self.log.debug('No ZenPack named %s in zeo' % packName)
- if zp:
- zp.remove(self.app)
- self.dmd.ZenPackManager.packs._delObject(packName)
- root = zenPath('Products', packName)
- self.log.debug('Removing %s' % root)
- recurse = ""
- if os.path.isdir(root):
- recurse = "r"
- os.system('rm -%sf %s' % (recurse, root))
- cleanupSkins(self.dmd)
-
-
def extract(self, fname):
"Unpack a ZenPack, and return the name"
if not os.path.isfile(fname):
|
|
From: <sv...@ze...> - 2008-04-15 03:25:20
|
Author: jstevens
Date: 2008-04-14 23:25:27 -0400 (Mon, 14 Apr 2008)
New Revision: 8995
Modified:
trunk/Products/ZenModel/migrate/Migrate.py
Log:
refs #2924
* Augmented command line option descriptions.
Modified: trunk/Products/ZenModel/migrate/Migrate.py
===================================================================
--- trunk/Products/ZenModel/migrate/Migrate.py 2008-04-14 22:54:30 UTC (rev 8994)
+++ trunk/Products/ZenModel/migrate/Migrate.py 2008-04-15 03:25:27 UTC (rev 8995)
@@ -359,7 +359,9 @@
self.parser.add_option('--step',
action='append',
dest="steps",
- help="Run the given step")
+ help="Run the specified step. This option "
+ 'can be specified multiple times to run '
+ 'more than on step.')
# NB: The flag for this setting indicates a false value for the setting.
self.parser.add_option('--dont-commit',
dest="commit",
@@ -375,7 +377,8 @@
dest="level",
type='string',
default=None,
- help="Run the steps by version number")
+ help="Run the steps for the specified level "
+ ' and above.')
self.parser.add_option('--newer',
dest='newer',
action='store_true',
@@ -390,7 +393,9 @@
action='store_true',
default=False,
help='Force version inappropriate migrate '
- 'steps to run.')
+ 'steps to run. This can happen when '
+ 'trying to skip a minor version '
+ 'when upgrading.')
ZenScriptBase.buildOptions(self)
|
|
From: <sv...@ze...> - 2008-04-14 22:54:23
|
Author: sjakesch
Date: 2008-04-14 18:54:30 -0400 (Mon, 14 Apr 2008)
New Revision: 8994
Modified:
trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt
trunk/Products/ZenModel/UserSettings.py
Log:
allow a ZenUser to _see_ Event Views
Modified: trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt 2008-04-14 19:46:10 UTC (rev 8993)
+++ trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt 2008-04-14 22:54:30 UTC (rev 8994)
@@ -37,11 +37,12 @@
<tal:block tal:repeat="view batch">
<tr tal:define="odd repeat/view/odd"
tal:attributes="class python:test(odd, 'odd', 'even')">
- <td class="tablevalues"
- tal:condition="python:here.checkRemotePerm('Change Event Views',
- here)">
+ <td class="tablevalues">
+ <tal:block tal:condition="python:here.checkRemotePerm('Change Event Views',
+ here)" >
<input type="checkbox" name="ids:list"
tal:attributes="value view/getId"/>
+ </tal:block>
<a tal:attributes="href view/getPrimaryUrlPath"
tal:content="view/getId">view</a>
</td>
Modified: trunk/Products/ZenModel/UserSettings.py
===================================================================
--- trunk/Products/ZenModel/UserSettings.py 2008-04-14 19:46:10 UTC (rev 8993)
+++ trunk/Products/ZenModel/UserSettings.py 2008-04-14 22:54:30 UTC (rev 8994)
@@ -488,7 +488,7 @@
},
{'name' : 'Event Views',
'action' : 'editEventViews',
- 'permissions' : (ZEN_CHANGE_EVENT_VIEWS,),
+ 'permissions' : (ZEN_CHANGE_SETTINGS,),
},
{'name' : 'Alerting Rules',
'action' : 'editActionRules',
|
|
From: <sv...@ze...> - 2008-04-14 19:46:09
|
Author: cluther
Date: 2008-04-14 15:46:10 -0400 (Mon, 14 Apr 2008)
New Revision: 8993
Modified:
trunk/Products/ZenModel/migrate/removeStatusMonitor.py
trunk/Products/ZenModel/skins/zenmodel/addDevice.pt
trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor_grid.pt
trunk/Products/ZenModel/skins/zenmodel/leftPane.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt
Log:
* Refs #2847: Change "Performance Monitor" wording to "Collector" in UI.
Modified: trunk/Products/ZenModel/migrate/removeStatusMonitor.py
===================================================================
--- trunk/Products/ZenModel/migrate/removeStatusMonitor.py 2008-04-14 19:34:00 UTC (rev 8992)
+++ trunk/Products/ZenModel/migrate/removeStatusMonitor.py 2008-04-14 19:46:10 UTC (rev 8993)
@@ -44,4 +44,36 @@
for perf in dmd.Monitors.Performance.objectSubValues():
perf.checkRelations(repair=True)
+ # Fix menu items
+ dlm = dmd.zenMenus._getOb('Device_list')
+ if dlm:
+ if dlm.zenMenuItems._getOb('setStatusMonitors', False):
+ dlm.zenMenuItems._delObject('setStatusMonitors')
+
+ spm = dlm.zenMenuItems._getOb('setPerformanceMonitor', False)
+ if spm:
+ spm.description = 'Set Collector...'
+
+ dlm = dmd.zenMenus._getOb('DeviceGrid_list')
+ if dlm:
+ if dlm.zenMenuItems._getOb('setStatusMonitors_grid', False):
+ dlm.zenMenuItems._delObject('setStatusMonitors_grid')
+
+ spm = dlm.zenMenuItems._getOb('setPerformanceMonitor_grid', False)
+ if spm:
+ spm.description = 'Set Collector...'
+
+ if dmd.zenMenus._getOb('StatusMonitor_list', False):
+ dmd.zenMenus._delObject('StatusMonitor_list')
+
+ pml = dmd.zenMenus._getOb('PerformanceMonitor_list')
+ if pml:
+ apm = pml.zenMenuItems._getOb('addPMonitor', False)
+ if apm:
+ apm.description = 'Add Collector...'
+
+ rpm = pml.zenMenuItems._getOb('removePMonitors', False)
+ if rpm:
+ rpm.description = 'Delete Collectors...'
+
RemoveStatusMonitor()
Modified: trunk/Products/ZenModel/skins/zenmodel/addDevice.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/addDevice.pt 2008-04-14 19:34:00 UTC (rev 8992)
+++ trunk/Products/ZenModel/skins/zenmodel/addDevice.pt 2008-04-14 19:46:10 UTC (rev 8993)
@@ -320,7 +320,7 @@
</td>
</tr>
<tr>
- <td class="tableheader" align="left">Performance Monitor</td>
+ <td class="tableheader" align="left">Collector</td>
<td class="tablevalues" align="left" colspan=3>
<select class="tablevalues" name="performanceMonitor"
tal:define="
@@ -336,7 +336,7 @@
</td>
</tr>
<tr>
- <td class="tableheader" align="left">New Performance Monitor</td>
+ <td class="tableheader" align="left">New Collector</td>
<td class="tablevalues" align="left" colspan="3">
<input class="tablevalues" type="text"
size="40" name="newPerformanceMonitor"
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt 2008-04-14 19:34:00 UTC (rev 8992)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt 2008-04-14 19:46:10 UTC (rev 8993)
@@ -142,7 +142,7 @@
None
</div>
</dd>
- <dt>Perf Server</dt>
+ <dt>Collector</dt>
<dd>
<div tal:replace="structure python:
here.perfServer.getPrimaryLink()">
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor.pt 2008-04-14 19:34:00 UTC (rev 8992)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor.pt 2008-04-14 19:46:10 UTC (rev 8993)
@@ -1,8 +1,8 @@
<tal:block metal:define-macro="body">
-<h2>Set Performance Monitor</h2>
+<h2>Set Collector</h2>
<br/>
<p style="text-align:center;font-size:0.8em;">
-Performance Monitor: <select class="tablevalues" name="performanceMonitor"
+Collector: <select class="tablevalues" name="performanceMonitor"
tal:define="
crks python:here.getDmdRoot('Monitors').getPerformanceMonitorNames();
curcrk here/getPerformanceServerName | request/performanceMonitor |
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor_grid.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor_grid.pt 2008-04-14 19:34:00 UTC (rev 8992)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_setPerformanceMonitor_grid.pt 2008-04-14 19:46:10 UTC (rev 8993)
@@ -1,7 +1,7 @@
-<h2>Set Performance Monitor</h2>
+<h2>Set Collector</h2>
<br/>
<p style="text-align:center;font-size:0.8em;">
-Performance Monitor: <select class="tablevalues" id="performanceMonitor"
+Collector: <select class="tablevalues" id="performanceMonitor"
name="performanceMonitor"
tal:define="
crks python:here.getDmdRoot('Monitors').getPerformanceMonitorNames();
Modified: trunk/Products/ZenModel/skins/zenmodel/leftPane.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/leftPane.pt 2008-04-14 19:34:00 UTC (rev 8992)
+++ trunk/Products/ZenModel/skins/zenmodel/leftPane.pt 2008-04-14 19:46:10 UTC (rev 8993)
@@ -35,7 +35,7 @@
<ul>
<li><a href="/zport/dmd/addDevice">Add Device</a></li>
<li><a href="/zport/dmd/Mibs">Mibs</a></li>
- <li><a href="/zport/dmd/Monitors">Monitors</a></li>
+ <li><a href="/zport/dmd/Monitors">Collectors</a></li>
<li><a href="/zport/dmd/editSettings">Settings</a></li>
<li><a href="/zport/dmd/ZenEventManager">Event Manager</a></li>
</ul>
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt 2008-04-14 19:34:00 UTC (rev 8992)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt 2008-04-14 19:46:10 UTC (rev 8993)
@@ -1,4 +1,4 @@
-<h2>Add Monitor</h2>
+<h2>Add Collector</h2>
<span id="errmsg" style="color:red;"></span>
<br/>
<p style="text-align:right;">
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt 2008-04-14 19:34:00 UTC (rev 8992)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt 2008-04-14 19:46:10 UTC (rev 8993)
@@ -1,7 +1,7 @@
-<h2>Delete Monitors</h2>
+<h2>Delete Collectors</h2>
<br/><br/>
<p>
-Are you sure you want to delete these monitors?<br/>
+Are you sure you want to delete these collectors?<br/>
</p>
<br/>
<div id="dialog_buttons">
|
|
From: <sv...@ze...> - 2008-04-14 19:33:53
|
Author: ian
Date: 2008-04-14 15:34:00 -0400 (Mon, 14 Apr 2008)
New Revision: 8992
Modified:
trunk/Products/ZenWidgets/ZenossPortlets/GoogleMapsPortlet.js
Log:
* Refs #2954: Potential fix for dashboard memory leak.
Modified: trunk/Products/ZenWidgets/ZenossPortlets/GoogleMapsPortlet.js
===================================================================
--- trunk/Products/ZenWidgets/ZenossPortlets/GoogleMapsPortlet.js 2008-04-14 19:03:47 UTC (rev 8991)
+++ trunk/Products/ZenWidgets/ZenossPortlets/GoogleMapsPortlet.js 2008-04-14 19:34:00 UTC (rev 8992)
@@ -43,7 +43,7 @@
//setStyle(this.resizehandle, {'height':'5px'});
},
force_reload: function() {
- this.body.innerHTML = this.body.innerHTML;
+ YAHOO.zenoss.setInnerHTML(this.body, this.body.innerHTML)
callLater(this.hardRefreshTime, this.force_reload);
},
buildSettingsPane: function() {
|
|
From: <sv...@ze...> - 2008-04-14 19:03:57
|
Author: buildslave
Date: 2008-04-14 15:03:47 -0400 (Mon, 14 Apr 2008)
New Revision: 8991
Modified:
trunk/bin/runtests
Log:
* Fixed exit code bug in runtests for selenium
Modified: trunk/bin/runtests
===================================================================
--- trunk/bin/runtests 2008-04-14 18:44:25 UTC (rev 8990)
+++ trunk/bin/runtests 2008-04-14 19:03:47 UTC (rev 8991)
@@ -10,7 +10,6 @@
STDOUT = sys.stdout
-
exitcodes = []
def findSeleniumTests(packages=[], regex=None):
@@ -96,4 +95,9 @@
if __name__=="__main__":
start = time.time()
main()
- sys.exit(max(exitcodes))
+ if exitcodes:
+ code = max(exitcodes)
+ else:
+ code = 0
+ sys.exit(code)
+
|
|
From: <sv...@ze...> - 2008-04-14 18:45:22
|
Author: marc
Date: 2008-04-14 14:44:25 -0400 (Mon, 14 Apr 2008)
New Revision: 8990
Modified:
trunk/Products/ZenWin/modeler/plugins/zenoss/wmi/WinServiceMap.py
trunk/Products/ZenWin/zenwin.py
Log:
* Forced zenwin and WinServicesMap (for zenwinmodeler) to repeat the sending of down events when a monitored winservice is stopped and continues to be stopped. fixes #2918
Modified: trunk/Products/ZenWin/modeler/plugins/zenoss/wmi/WinServiceMap.py
===================================================================
--- trunk/Products/ZenWin/modeler/plugins/zenoss/wmi/WinServiceMap.py 2008-04-14 18:37:53 UTC (rev 8989)
+++ trunk/Products/ZenWin/modeler/plugins/zenoss/wmi/WinServiceMap.py 2008-04-14 18:44:25 UTC (rev 8990)
@@ -60,18 +60,17 @@
else:
log.warning('%s: %s stopped' % (device.id, name))
device.services[name] = status + 1, severity
- if status == 0:
- msg = STATMSG % (name, "down")
- log.critical(msg)
- events.append(dict(summary=msg,
- eventClass=Status_WinService,
- device=device.id,
- severity=severity,
- agent="zenwinmodeler",
- component=name,
- eventGroup= "StatusTest",
- manager=getfqdn()))
- log.info("svc down %s, %s", device.id, name)
+ msg = STATMSG % (name, "down")
+ log.critical(msg)
+ events.append(dict(summary=msg,
+ eventClass=Status_WinService,
+ device=device.id,
+ severity=severity,
+ agent="zenwinmodeler",
+ component=name,
+ eventGroup= "StatusTest",
+ manager=getfqdn()))
+ log.info("svc down %s, %s", device.id, name)
return events
def process(self, device, results, log):
Modified: trunk/Products/ZenWin/zenwin.py
===================================================================
--- trunk/Products/ZenWin/zenwin.py 2008-04-14 18:37:53 UTC (rev 8989)
+++ trunk/Products/ZenWin/zenwin.py 2008-04-14 18:44:25 UTC (rev 8990)
@@ -55,10 +55,9 @@
if name not in device.services: return
status, severity = device.services[name]
device.services[name] = status + 1, severity
- if status == 0:
- msg = self.statmsg % (name, "down")
- self.sendEvent(self.mkevt(device.id, name, msg, severity))
- self.log.info("svc down %s, %s", device.id, name)
+ msg = self.statmsg % (name, "down")
+ self.sendEvent(self.mkevt(device.id, name, msg, severity))
+ self.log.info("svc down %s, %s", device.id, name)
def serviceRunning(self, device, name):
self.log.info('%s: %s running' % (device.id, name))
|
|
From: <sv...@ze...> - 2008-04-14 18:38:14
|
Author: ian Date: 2008-04-14 14:37:53 -0400 (Mon, 14 Apr 2008) New Revision: 8989 Modified: trunk/Products/ZenModel/ZVersion.py Log: * Increment version number Modified: trunk/Products/ZenModel/ZVersion.py =================================================================== --- trunk/Products/ZenModel/ZVersion.py 2008-04-14 13:11:23 UTC (rev 8988) +++ trunk/Products/ZenModel/ZVersion.py 2008-04-14 18:37:53 UTC (rev 8989) @@ -10,4 +10,4 @@ # For complete information please visit: http://www.zenoss.com/oss/ # ########################################################################### -VERSION="2.1.91" +VERSION="2.1.92" |
|
From: <sv...@ze...> - 2008-04-14 13:11:17
|
Author: jstevens
Date: 2008-04-14 09:11:23 -0400 (Mon, 14 Apr 2008)
New Revision: 8988
Modified:
trunk/Products/ZenModel/DataRoot.py
Log:
fixes #2935
* Changed the strftime format string for bacups tab
Modified: trunk/Products/ZenModel/DataRoot.py
===================================================================
--- trunk/Products/ZenModel/DataRoot.py 2008-04-12 14:39:16 UTC (rev 8987)
+++ trunk/Products/ZenModel/DataRoot.py 2008-04-14 13:11:23 UTC (rev 8988)
@@ -593,7 +593,7 @@
'modDate': info[stat.ST_MTIME],
'modDateFormatted': datetime.datetime.fromtimestamp(
info[stat.ST_MTIME]).strftime(
- '%a %b %d, %Y %X %p'),
+ '%c'),
})
fileInfo.sort(key=operator.itemgetter('modDate'))
return fileInfo
|
