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-05-19 12:53:13
|
Author: ecn Date: 2008-05-19 08:53:21 -0400 (Mon, 19 May 2008) New Revision: 9289 Added: sandboxen/jplouis/Products-remoteStuff/ZenEvents/tests/testSyslogProcessing.py Log: * fixes #3181: syslog not getting eventClassKey - add a little testing for syslog processing: ya gotta start somewhere Added: sandboxen/jplouis/Products-remoteStuff/ZenEvents/tests/testSyslogProcessing.py |
|
From: <sv...@ze...> - 2008-05-19 12:52:42
|
Author: ecn
Date: 2008-05-19 08:52:49 -0400 (Mon, 19 May 2008)
New Revision: 9288
Modified:
sandboxen/jplouis/Products-remoteStuff/ZenEvents/SyslogProcessing.py
Log:
* fixes #3181: syslog not getting eventClassKey
Modified: sandboxen/jplouis/Products-remoteStuff/ZenEvents/SyslogProcessing.py
===================================================================
--- sandboxen/jplouis/Products-remoteStuff/ZenEvents/SyslogProcessing.py 2008-05-19 12:49:27 UTC (rev 9287)
+++ sandboxen/jplouis/Products-remoteStuff/ZenEvents/SyslogProcessing.py 2008-05-19 12:52:49 UTC (rev 9288)
@@ -177,13 +177,13 @@
syslog events we use the summary of the event to perform a full text
or'ed search.
"""
- if hasattr(evt, 'eventClassKey') or hasattr(evt, 'eventClass'):
+ if evt.has_key('eventClassKey') or evt.has_key( 'eventClass'):
return evt
- elif hasattr(evt, 'ntevid'):
+ elif evt.has_key( 'ntevid'):
evt['eventClassKey'] = "%s_%s" % (evt['component'],evt['ntevid'])
- elif hasattr(evt, 'component'):
+ elif evt.has_key( 'component'):
evt['eventClassKey'] = evt['component']
- if hasattr(evt, 'eventClassKey'):
+ if evt.has_key( 'eventClassKey'):
slog.debug("eventClassKey=%s", evt['eventClassKey'])
try:
evt['eventClassKey'] = evt['eventClassKey'].decode('latin-1')
|
|
From: <sv...@ze...> - 2008-05-19 12:49:19
|
Author: marc Date: 2008-05-19 08:49:27 -0400 (Mon, 19 May 2008) New Revision: 9287 Modified: trunk/inst/docs/UPGRADE.txt Log: * added line breaks to make it <80 cols, refs #3187 Modified: trunk/inst/docs/UPGRADE.txt =================================================================== --- trunk/inst/docs/UPGRADE.txt 2008-05-19 12:43:38 UTC (rev 9286) +++ trunk/inst/docs/UPGRADE.txt 2008-05-19 12:49:27 UTC (rev 9287) @@ -40,15 +40,21 @@ Then run this command one of the following commands. If you would like to upgrade to the beta version of Zenoss, run this command: -root# conary migrate --interactive group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@zenoss:core-beta +root# conary migrate --interactive +group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@ +zenoss:core-beta If you would like to upgrade to the 2.2.x version of Zenoss, run this command: -root# conary migrate --interactive group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@zenoss:core-2.2 +root# conary migrate --interactive +group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@ +zenoss:core-2.2 If you would like to upgrade to the 2.1.x version of Zenoss, run this command: -root# conary migrate --interactive group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@zenoss:core +root# conary migrate --interactive +group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@ +zenoss:core ** Source tarball |
|
From: <sv...@ze...> - 2008-05-19 12:43:32
|
Author: abray
Date: 2008-05-19 08:43:38 -0400 (Mon, 19 May 2008)
New Revision: 9286
Modified:
trunk/zendocs/Install/StackInstall/Installer_Screenshot-MySQL-3.png
trunk/zendocs/Install/StackInstall/Installer_Screenshot-finish-7.png
trunk/zendocs/Install/StackInstall/Installer_Screenshot-location-2.png
trunk/zendocs/Install/StackInstall/Installer_Screenshot-progress-6.png
trunk/zendocs/Install/StackInstall/Installer_Screenshot-ready-4.png
trunk/zendocs/Install/StackInstall/Installer_Screenshot-welcome-1.png
trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html
trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml
Log:
Updates to Stack Install doc -drew2
Modified: trunk/zendocs/Install/StackInstall/Installer_Screenshot-MySQL-3.png
===================================================================
(Binary files differ)
Modified: trunk/zendocs/Install/StackInstall/Installer_Screenshot-finish-7.png
===================================================================
(Binary files differ)
Modified: trunk/zendocs/Install/StackInstall/Installer_Screenshot-location-2.png
===================================================================
(Binary files differ)
Modified: trunk/zendocs/Install/StackInstall/Installer_Screenshot-progress-6.png
===================================================================
(Binary files differ)
Modified: trunk/zendocs/Install/StackInstall/Installer_Screenshot-ready-4.png
===================================================================
(Binary files differ)
Modified: trunk/zendocs/Install/StackInstall/Installer_Screenshot-welcome-1.png
===================================================================
(Binary files differ)
Modified: trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html
===================================================================
--- trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html 2008-05-19 12:19:10 UTC (rev 9285)
+++ trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html 2008-05-19 12:43:38 UTC (rev 9286)
@@ -1,3 +1,3 @@
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>1. Installing Zenoss from the GUI-Based Stack Installers</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e1"></a>1. Installing Zenoss from the GUI-Based Stack Installers</h2></div></div><hr></div><p>This document will step you through installing Zenoss and the Zenoss stack using the point and click stack installers. These installers work on the following Linux platforms and architectures.</p><p></p><p>NOTE: If you are upgrading from a previous Zenoss installation that was not a stack installer, please follow the instructions in the document named "UPGRADE_FROM_SOURCE_TO _INSTALL_STACK.txt" which is also available from the Zenoss website.</p><p></p><div class="orderedlist"><ol ty!
pe="1"><li><p>Download the latest installation package from http://www.zenoss.com/download.</p><p></p></li><li><p>Choose from the following installation methods depending on your environment; Command Line, KDE, or Gnome. Then continue following the installation instructions with Step number 3 below.</p><div class="orderedlist"><ol type="a"><li><p>Opening the Installer Using the Command Line</p><p>Note that zenoss*.bin is the current file you are trying to install.</p><div class="orderedlist"><ol type="i"><li><p>Open a command-line prompt and change directories (cd) into the directory where you downloaded the installer.</p><pre class="programlisting">$ cd <Your download directory>/</pre><p></p></li><li><p>Make the installer executable using the command:</p><pre class="programlisting">$ chmod +x ./zenoss*.bin</pre><p></p></li><li><p>Execute the installer as root. If you know your root password, use the su command:</p><pre class="programlisting">$ su root -c ./zenoss*.bi!
n</pre><p>If you do not know your root password, use the sudo !
command:
</p><pre class="programlisting">$ sudo ./zenoss*.bin</pre></li><li><p>Answer the installation prompts (as described starting in step 3 below). The package will be installed in /usr/local/zenoss.</p><p></p></li><li><p>The package will create a zenoss user with a home directory in /home/zenoss. In order to run commands that are specified in the Zenoss admin guide, you must become the zenoss user.</p><p>If you know your root password, use the su command to become root, then to become zenoss:</p><pre class="programlisting">$ su - root # su - zenoss</pre><p>If you don't know your root password, use the sudo command:</p><pre class="programlisting">$ sudo su - zenoss</pre><p>If you would prefer not to become the zenoss user, you can also run:</p><pre class="programlisting">$ /usr/local/zenoss/zenconsole</pre><p>to enter a shell with the Zenoss environment. You can then start/stop daemons, enter zendmd, and perform other command line tasks.</p><p></p></li></ol></div></li><li><p>Open!
ing the Installer in KDE</p><div class="orderedlist"><ol type="i"><li><p>Make the file executable. Locate the downloaded file, and right-click on it, and select the "Properties" menu item.</p><p></p></li><li><p>Select the "Permissions" tab and check the "Is executable" check box. Select "Ok" to close the dialog.</p><p></p></li><li><p>Run the program as root. Right click on the file and select the "Open With ..." menu item.</p><p></p></li><li><p>Enter "kdesu" as the command to open the Zenoss installer.</p><p></p></li></ol></div></li><li><p>Opening the Installer in Gnome</p><div class="orderedlist"><ol type="i"><li><p>Make the file executable. Locate the downloaded file, and right-click on it, and select the "Properties" menu item.</p><p></p></li><li><p>Select the "Permissions" tab and check the "Allow executing file as program" check box. Close the dialog.</p><p></p></li><li><p>Run the program as root. Right click on the file and select the "Open with Other Application..." !
menu item.</p><p></p></li><li><p>Select the "Use a custom comm!
and" ite
m. Enter "gksu".</p></li></ol></div></li></ol></div><p></p></li><li><p>The installer will prompt for the following basic configuration information upon startup.</p><p></p><div class="itemizedlist"><ul type="disc"><li><p>The installation location (default /usr/local/zenoss)</p></li><li><p>The root password for MySQL</p></li></ul></div><p>If your computer is already running programs that conflict with the Zenoss networking configuration, you will see additional prompts to choose alternative port numbers.</p><p>Once you install Zenoss, you can reach the web-based user interface with the url:</p><p>http://<zenoss computer>:8080/</p><p>If you already had something using port 8080, you will be prompted for a new port on installation. For example, if you installed on your local computer, and selected port 8888 as the new port for the Zope server, you would use the following url: http://localhost:8888</p><p></p><p>If the installer is run from a desktop, it will provide the fol!
lowing graphical dialog prompts. If the installer is run from a headless or remote location, it will use simple command-line prompts.</p><p>After launching the installer, the initial Zenoss installer screen appears.</p><div class="figure"><a name="d0e133"></a><p class="title"><b>Figure 1. Zenoss Installer Screen - Welcome</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-welcome-1.png" alt="Zenoss Installer Screen - Welcome"></div></div></div><br class="figure-break"><p>Click Forward to proceed.</p></li><li><p>Choose the install location for Zenoss.</p><div class="figure"><a name="d0e144"></a><p class="title"><b>Figure 2. Zenoss Installer Screen Location</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-location-2.png" alt="Zenoss Installer Screen Location"></div></div></div><br class="figure-break"><p>Click Forward.</p></li><li><p>The next Installer s!
creen appears prompting you for the MySQL password information!
.</p><p>
</p><div class="figure"><a name="d0e156"></a><p class="title"><b>Figure 3. Zenoss Installer Screen - MySQL Password</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-MySQL-3.png" alt="Zenoss Installer Screen - MySQL Password"></div></div></div><br class="figure-break"><p>The root password for MySQL is for a fresh installation of MySQL dedicated exclusively to Zenoss and not the root password for the computer, or the root password to any existing MySQL installation. You may use any non-empty password, this password is not stored by the Zenoss installer.</p><p>Click Forward.</p></li><li><p>You are now ready to Install Zenoss.</p><div class="figure"><a name="d0e169"></a><p class="title"><b>Figure 4. Zenoss Installer Screen - Ready to Install</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-ready-4.png" alt="Zenoss Installer Screen - Ready to Install"></di!
v></div></div><br class="figure-break"><p>Click forward to start the install process.</p><div class="figure"><a name="d0e177"></a><p class="title"><b>Figure 5. Zenoss Installer Screen - Progress Bar</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-progress-6.png" alt="Zenoss Installer Screen - Progress Bar"></div></div></div><br class="figure-break"><p>This point in the installation process may take several minutes without showing any change. Note that there is a long pause near the end of the installation as Zenoss is initializing itself. This wait may take several minutes.</p><p></p></li><li><p>When installation is complete you will see the following dialog.</p><div class="figure"><a name="d0e189"></a><p class="title"><b>Figure 6. Zenoss Installer Screen - Finish and Launch Zenoss</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-finish-7.png" alt="!
Zenoss Installer Screen - Finish and Launch Zenoss"></div></di!
v></div>
<br class="figure-break"><p>If you select "Launch Zenoss" the installer will attempt to run your web browser and point it to Zenoss. If this fails (usually because your browser is already running), just use the URL scheme discussed in step 3 above.</p></li></ol></div></div></body></html>
\ No newline at end of file
+ <title>1. Installing Zenoss from the GUI-Based Stack Installers</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e1"></a>1. Installing Zenoss from the GUI-Based Stack Installers</h2></div></div><hr></div><p>This document will step you through installing Zenoss and the Zenoss stack using the point and click stack installers. These installers work on the following Linux platforms and architectures.</p><p></p><p>NOTE: If you are upgrading from a previous Zenoss installation that was not a stack installer, please follow the instructions in the document named "UPGRADE_FROM_SOURCE_TO _INSTALL_STACK.txt" which is also available from the Zenoss website.</p><p></p><div class="orderedlist"><ol ty!
pe="1"><li><p>Download the latest installation package from http://www.zenoss.com/download.</p><p></p></li><li><p>Choose from the following installation methods depending on your environment; Command Line, KDE, or Gnome. Then continue following the installation instructions with Step number 3 below.</p><div class="orderedlist"><ol type="a"><li><p>Opening the Installer Using the Command Line</p><p>Note that zenoss*.bin is the current file you are trying to install.</p><div class="orderedlist"><ol type="i"><li><p>Open a command-line prompt and change directories (cd) into the directory where you downloaded the installer.</p><pre class="programlisting">$ cd <Your download directory>/</pre><p></p></li><li><p>Make the installer executable using the command:</p><pre class="programlisting">$ chmod +x ./zenoss*.bin</pre><p></p></li><li><p>Execute the installer as root. If you know your root password, use the su command:</p><pre class="programlisting">$ su root -c ./zenoss*.bi!
n</pre><p>If you do not know your root password, use the sudo !
command:
</p><pre class="programlisting">$ sudo ./zenoss*.bin</pre></li><li><p>Answer the installation prompts (as described starting in step 3 below). The package will be installed in /usr/local/zenoss.</p><p></p></li><li><p>The package will create a zenoss user with a home directory in /home/zenoss. In order to run commands that are specified in the Zenoss admin guide, you must become the zenoss user.</p><p>If you know your root password, use the su command to become root, then to become user zenoss:</p><pre class="programlisting">$ su - root # su - zenoss</pre><p>If you don't know your root password, use the sudo command:</p><pre class="programlisting">$ sudo su - zenoss</pre><p>If you would prefer not to become the zenoss user, you can also run:</p><pre class="programlisting">$ /usr/local/zenoss/zenconsole</pre><p>to enter a shell with the Zenoss environment. You can then start/stop daemons, enter zendmd, and perform other command line tasks.</p><p></p></li></ol></div></li><li><p!
>Opening the Installer in KDE</p><div class="orderedlist"><ol type="i"><li><p>Make the file executable. Locate the downloaded file, and right-click on it, and select the "Properties" menu item.</p><p></p></li><li><p>Select the "Permissions" tab and check the "Is executable" check box. Select "Ok" to close the dialog.</p><p></p></li><li><p>Run the program as root. Right click on the file and select the "Open With ..." menu item.</p><p></p></li><li><p>Enter "kdesu" as the command to open the Zenoss installer.</p><p></p></li></ol></div></li><li><p>Opening the Installer in Gnome</p><div class="orderedlist"><ol type="i"><li><p>Make the file executable. Locate the downloaded file, and right-click on it, and select the "Properties" menu item.</p><p></p></li><li><p>Select the "Permissions" tab and check the "Allow executing file as program" check box. Close the dialog.</p><p></p></li><li><p>Run the program as root. Right click on the file and select the "Open with Other Application!
..." menu item.</p><p></p></li><li><p>Select the "Use a custom!
command
" item. Enter "gksu".</p></li></ol></div></li></ol></div><p></p></li><li><p>The installer will prompt for the following basic configuration information upon startup.</p><p></p><div class="itemizedlist"><ul type="disc"><li><p>The installation location (default /usr/local/zenoss)</p></li><li><p>The root password for MySQL</p></li></ul></div><p>If your computer is already running programs that conflict with the Zenoss networking configuration, you will see additional prompts to choose alternative port numbers.</p><p>Once you install Zenoss, you can reach the web-based user interface with the url:</p><p>http://<zenoss computer>:8080/</p><p>If you already had something using port 8080, you will be prompted for a new port on installation. For example, if you installed on your local computer, and selected port 8888 as the new port for the Zope server, you would use the following url: http://localhost:8888</p><p></p><p>If the installer is run from a desktop, it will provide th!
e following graphical dialog prompts. If the installer is run from a headless or remote location, it will use simple command-line prompts.</p><p>After launching the installer, the initial Zenoss installer screen appears.</p><div class="figure"><a name="d0e133"></a><p class="title"><b>Figure 1. Zenoss Installer Screen - Welcome</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-welcome-1.png" alt="Zenoss Installer Screen - Welcome"></div></div></div><br class="figure-break"><p>Click Forward to proceed.</p></li><li><p>Choose the install location for Zenoss.</p><div class="figure"><a name="d0e144"></a><p class="title"><b>Figure 2. Zenoss Installer Screen Location</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-location-2.png" alt="Zenoss Installer Screen Location"></div></div></div><br class="figure-break"><p>Click Forward.</p></li><li><p>The next Instal!
ler screen appears prompting you for the MySQL password inform!
ation.</
p><p></p><div class="figure"><a name="d0e156"></a><p class="title"><b>Figure 3. Zenoss Installer Screen - MySQL Password</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-MySQL-3.png" alt="Zenoss Installer Screen - MySQL Password"></div></div></div><br class="figure-break"><p>The root password for MySQL is for a fresh installation of MySQL dedicated exclusively to Zenoss and not the root password for the computer, or the root password to any existing MySQL installation. You may use any non-empty password, this password is not stored by the Zenoss installer.</p><p>Click Forward.</p></li><li><p>You are now ready to Install Zenoss.</p><div class="figure"><a name="d0e169"></a><p class="title"><b>Figure 4. Zenoss Installer Screen - Ready to Install</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-ready-4.png" alt="Zenoss Installer Screen - Ready to Install"!
></div></div></div><br class="figure-break"><p>Click forward to start the install process.</p><div class="figure"><a name="d0e177"></a><p class="title"><b>Figure 5. Zenoss Installer Screen - Progress Bar</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-progress-6.png" alt="Zenoss Installer Screen - Progress Bar"></div></div></div><br class="figure-break"><p>This point in the installation process may take several minutes without showing any change. Note that there is a long pause near the end of the installation as Zenoss is initializing itself. This wait may take several minutes.</p><p></p></li><li><p>When installation is complete you will see the following dialog.</p><div class="figure"><a name="d0e189"></a><p class="title"><b>Figure 6. Zenoss Installer Screen - Finish and Launch Zenoss</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-finish-7.png" !
alt="Zenoss Installer Screen - Finish and Launch Zenoss"></div!
></div><
/div><br class="figure-break"><p>If you select "Launch Zenoss" the installer will attempt to run your web browser and point it to Zenoss. If this fails (usually because your browser is already running), just use the URL scheme discussed in step 3 above.</p></li></ol></div></div></body></html>
\ No newline at end of file
Modified: trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml
===================================================================
--- trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml 2008-05-19 12:19:10 UTC (rev 9285)
+++ trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml 2008-05-19 12:43:38 UTC (rev 9286)
@@ -82,7 +82,7 @@
user.</para>
<para>If you know your root password, use the su command to
- become root, then to become zenoss:</para>
+ become root, then to become user zenoss:</para>
<para><programlisting>$ su - root # su - zenoss</programlisting>If
you don't know your root password, use the sudo command:</para>
|
|
From: <sv...@ze...> - 2008-05-19 12:19:09
|
Author: ian
Date: 2008-05-19 08:19:10 -0400 (Mon, 19 May 2008)
New Revision: 9285
Modified:
branches/zenoss-2.2.x/inst/docs/INSTALL_DEB_STACK.txt
Log:
* Backporting r9283 into branch
Modified: branches/zenoss-2.2.x/inst/docs/INSTALL_DEB_STACK.txt
===================================================================
--- branches/zenoss-2.2.x/inst/docs/INSTALL_DEB_STACK.txt 2008-05-19 12:13:07 UTC (rev 9284)
+++ branches/zenoss-2.2.x/inst/docs/INSTALL_DEB_STACK.txt 2008-05-19 12:19:10 UTC (rev 9285)
@@ -9,7 +9,7 @@
Alternatively, you can add the Zenoss repository to /etc/apt/sources.list:
# Zenoss repository
- deb http://dev.zenoss.org/deb stable
+ deb http://dev.zenoss.org/deb main stable
Then:
|
|
From: <sv...@ze...> - 2008-05-19 12:13:04
|
Author: abray
Date: 2008-05-19 08:13:07 -0400 (Mon, 19 May 2008)
New Revision: 9284
Modified:
trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html
trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml
Log:
Updates to Stack Install doc -drew
Modified: trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html
===================================================================
--- trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html 2008-05-19 12:08:56 UTC (rev 9283)
+++ trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html 2008-05-19 12:13:07 UTC (rev 9284)
@@ -1,3 +1,3 @@
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>1. Installing Zenoss from the GUI-Based Stack Installers</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e1"></a>1. Installing Zenoss from the GUI-Based Stack Installers</h2></div></div><hr></div><p>This document will step you through installing Zenoss and the Zenoss stack using the point and click stack installers. If you are upgrading from a previous Zenoss installation that was not a stack installer, please follow the instructions in XXXXXXXXXXXXXX</p><p></p><div class="orderedlist"><ol type="1"><li><p>Download the latest installation package from http://www.zenoss.com/download.</p><p></p></li><li><p>Choose from the following installation methods depending on your environment!
; Command Line, KDE, or Gnome. Then continue following the installation instructions with Step number 3 below.</p><div class="orderedlist"><ol type="a"><li><p>Opening the Installer Using the Command Line</p><div class="orderedlist"><ol type="i"><li><p>Open a command-line prompt and change directories (cd) into the directory where you downloaded the installer.</p><pre class="programlisting">$ cd <Your download directory>/</pre><p></p></li><li><p>Make the installer executable using the command:</p><pre class="programlisting">$ chmod +x ./zenoss*.bin</pre><p></p></li><li><p>Execute the installer as root. If you know your root password, use the su command: </p><pre class="programlisting">$ su root -c ./zenoss*.bin</pre><p>If you do not know your root password, use the sudo command:</p><pre class="programlisting">$ sudo ./zenoss*.bin</pre></li><li><p>Answer the installation prompts (as described starting in step 3 below). The package will be installed in /usr/local/zenoss.!
</p><p></p></li><li><p>The package will create a zenoss user !
with a h
ome directory in /home/zenoss. In order to run commands that are specified in the Zenoss admin guide, you must become the zenoss user.</p><p>If you know your root password, use the su command to become root, then to become zenoss:</p><pre class="programlisting">$ su - root # su - zenoss</pre><p>If you don't know your root password, use the sudo command:</p><pre class="programlisting">$ sudo su - zenoss</pre><p>If you would prefer not to become the zenoss user, you can also run:</p><pre class="programlisting">$ /usr/local/zenoss/zenconsole</pre><p>to enter a shell with the Zenoss environment. You can then start/stop daemons, enter zendmd, and perform other command line tasks. </p><p></p></li></ol></div></li><li><p>Opening the Installer in KDE </p><div class="orderedlist"><ol type="i"><li><p>Make the file executable. Locate the downloaded file, and right-click on it, and select the "Properties" menu item. </p><p></p></li><li><p>Select the "Permissions" tab and check the "Is ex!
ecutable" check box. Select "Ok" to close the dialog. </p><p></p></li><li><p>Run the program as root. Right click on the file and select the "Open With ..." menu item. </p><p></p></li><li><p>Enter "kdesu" as the command to open the Zenoss installer.</p><p></p></li></ol></div></li><li><p>Opening the Installer in Gnome</p><div class="orderedlist"><ol type="i"><li><p>Make the file executable. Locate the downloaded file, and right-click on it, and select the "Properties" menu item. </p><p></p></li><li><p>Select the "Permissions" tab and check the "Allow executing file as program" check box. Close the dialog.</p><p></p></li><li><p>Run the program as root. Right click on the file and select the "Open with Other Application..." menu item. </p><p></p></li><li><p>Select the "Use a custom command" item. Enter "gksu".</p></li></ol></div></li></ol></div><p></p></li><li><p>The installer will prompt for the following basic configuration information upon startup.</p><p></p><div class="it!
emizedlist"><ul type="disc"><li><p>The installation location (!
default
/usr/local/zenoss)</p></li><li><p>The root password for MySQL</p></li></ul></div><p>If your computer is already running programs that conflict with the Zenoss networking configuration, you will see additional prompts to choose alternative port numbers.</p><p>Once you install Zenoss, you can reach the web-based user interface with the url:</p><p>http://<zenoss computer>:8080/</p><p>If you already had something using port 8080, you will be prompted for a new port on installation. For example, if you installed on your local computer, and selected port 8888 as the new port for the Zope server, you would use the following url: http://localhost:8888 </p><p></p><p>If the installer is run from a desktop, it will provide the following graphical dialog prompts. If the installer is run from a headless or remote location, it will use simple command-line prompts.</p><p>After launching the installer, the initial Zenoss installer screen appears.</p><p></p><div class="figure"><a name=!
"d0e129"></a><p class="title"><b>Figure 1. Zenoss Installer Screen - Welcome</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-welcome-1.png" alt="Zenoss Installer Screen - Welcome"></div></div></div><br class="figure-break"><p>Click Forward to proceed.</p></li><li><p>Choose the install location for Zenoss.</p><div class="figure"><a name="d0e140"></a><p class="title"><b>Figure 2. Zenoss Installer Screen Location</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-location-2.png" alt="Zenoss Installer Screen Location"></div></div></div><br class="figure-break"><p>Click Forward.</p></li><li><p>The next Installer screen appears prompting you for the MySQL password information.</p><p></p><div class="figure"><a name="d0e152"></a><p class="title"><b>Figure 3. Zenoss Installer Screen - MySQL Password</b></p><div class="figure-contents"><div class="med!
iaobject"><img src="resources/Installer_Screenshot-MySQL-3.png!
" alt="Z
enoss Installer Screen - MySQL Password"></div></div></div><br class="figure-break"><p>The root password for MySQL is for a fresh installation of MySQL dedicated exclusively to Zenoss and not the root password for the computer, or the root password to any existing MySQL installation. You may use any non-empty password, this password is not stored by the Zenoss installer.</p><p>Click Forward.</p></li><li><p>You are now ready to Install Zenoss.</p><div class="figure"><a name="d0e165"></a><p class="title"><b>Figure 4. Zenoss Installer Screen - Ready to Install</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-ready-4.png" alt="Zenoss Installer Screen - Ready to Install"></div></div></div><br class="figure-break"><p>Click forward to start the install process.</p><div class="figure"><a name="d0e173"></a><p class="title"><b>Figure 5. Zenoss Installer Screen - Progress Bar</b></p><div class="figure-contents"><d!
iv class="mediaobject"><img src="resources/Installer_Screenshot-progress-6.png" alt="Zenoss Installer Screen - Progress Bar"></div></div></div><br class="figure-break"><p>This point in the installation process may take several minutes without showing any change. Note that there is a long pause near the end of the installation as Zenoss is initializing itself. This wait may take several minutes. </p><p></p></li><li><p>When installation is complete you will see the following dialog.</p><div class="figure"><a name="d0e185"></a><p class="title"><b>Figure 6. Zenoss Installer Screen - Finish and Launch Zenoss</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-finish-7.png" alt="Zenoss Installer Screen - Finish and Launch Zenoss"></div></div></div><br class="figure-break"><p>If you select "Launch Zenoss" the installer will attempt to run your web browser and point it to Zenoss. If this fails (usually because your browse!
r is already running), just use the URL scheme discussed in st!
ep 3 abo
ve.</p></li></ol></div></div></body></html>
\ No newline at end of file
+ <title>1. Installing Zenoss from the GUI-Based Stack Installers</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e1"></a>1. Installing Zenoss from the GUI-Based Stack Installers</h2></div></div><hr></div><p>This document will step you through installing Zenoss and the Zenoss stack using the point and click stack installers. These installers work on the following Linux platforms and architectures.</p><p></p><p>NOTE: If you are upgrading from a previous Zenoss installation that was not a stack installer, please follow the instructions in the document named "UPGRADE_FROM_SOURCE_TO _INSTALL_STACK.txt" which is also available from the Zenoss website.</p><p></p><div class="orderedlist"><ol ty!
pe="1"><li><p>Download the latest installation package from http://www.zenoss.com/download.</p><p></p></li><li><p>Choose from the following installation methods depending on your environment; Command Line, KDE, or Gnome. Then continue following the installation instructions with Step number 3 below.</p><div class="orderedlist"><ol type="a"><li><p>Opening the Installer Using the Command Line</p><p>Note that zenoss*.bin is the current file you are trying to install.</p><div class="orderedlist"><ol type="i"><li><p>Open a command-line prompt and change directories (cd) into the directory where you downloaded the installer.</p><pre class="programlisting">$ cd <Your download directory>/</pre><p></p></li><li><p>Make the installer executable using the command:</p><pre class="programlisting">$ chmod +x ./zenoss*.bin</pre><p></p></li><li><p>Execute the installer as root. If you know your root password, use the su command:</p><pre class="programlisting">$ su root -c ./zenoss*.bi!
n</pre><p>If you do not know your root password, use the sudo !
command:
</p><pre class="programlisting">$ sudo ./zenoss*.bin</pre></li><li><p>Answer the installation prompts (as described starting in step 3 below). The package will be installed in /usr/local/zenoss.</p><p></p></li><li><p>The package will create a zenoss user with a home directory in /home/zenoss. In order to run commands that are specified in the Zenoss admin guide, you must become the zenoss user.</p><p>If you know your root password, use the su command to become root, then to become zenoss:</p><pre class="programlisting">$ su - root # su - zenoss</pre><p>If you don't know your root password, use the sudo command:</p><pre class="programlisting">$ sudo su - zenoss</pre><p>If you would prefer not to become the zenoss user, you can also run:</p><pre class="programlisting">$ /usr/local/zenoss/zenconsole</pre><p>to enter a shell with the Zenoss environment. You can then start/stop daemons, enter zendmd, and perform other command line tasks.</p><p></p></li></ol></div></li><li><p>Open!
ing the Installer in KDE</p><div class="orderedlist"><ol type="i"><li><p>Make the file executable. Locate the downloaded file, and right-click on it, and select the "Properties" menu item.</p><p></p></li><li><p>Select the "Permissions" tab and check the "Is executable" check box. Select "Ok" to close the dialog.</p><p></p></li><li><p>Run the program as root. Right click on the file and select the "Open With ..." menu item.</p><p></p></li><li><p>Enter "kdesu" as the command to open the Zenoss installer.</p><p></p></li></ol></div></li><li><p>Opening the Installer in Gnome</p><div class="orderedlist"><ol type="i"><li><p>Make the file executable. Locate the downloaded file, and right-click on it, and select the "Properties" menu item.</p><p></p></li><li><p>Select the "Permissions" tab and check the "Allow executing file as program" check box. Close the dialog.</p><p></p></li><li><p>Run the program as root. Right click on the file and select the "Open with Other Application..." !
menu item.</p><p></p></li><li><p>Select the "Use a custom comm!
and" ite
m. Enter "gksu".</p></li></ol></div></li></ol></div><p></p></li><li><p>The installer will prompt for the following basic configuration information upon startup.</p><p></p><div class="itemizedlist"><ul type="disc"><li><p>The installation location (default /usr/local/zenoss)</p></li><li><p>The root password for MySQL</p></li></ul></div><p>If your computer is already running programs that conflict with the Zenoss networking configuration, you will see additional prompts to choose alternative port numbers.</p><p>Once you install Zenoss, you can reach the web-based user interface with the url:</p><p>http://<zenoss computer>:8080/</p><p>If you already had something using port 8080, you will be prompted for a new port on installation. For example, if you installed on your local computer, and selected port 8888 as the new port for the Zope server, you would use the following url: http://localhost:8888</p><p></p><p>If the installer is run from a desktop, it will provide the fol!
lowing graphical dialog prompts. If the installer is run from a headless or remote location, it will use simple command-line prompts.</p><p>After launching the installer, the initial Zenoss installer screen appears.</p><div class="figure"><a name="d0e133"></a><p class="title"><b>Figure 1. Zenoss Installer Screen - Welcome</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-welcome-1.png" alt="Zenoss Installer Screen - Welcome"></div></div></div><br class="figure-break"><p>Click Forward to proceed.</p></li><li><p>Choose the install location for Zenoss.</p><div class="figure"><a name="d0e144"></a><p class="title"><b>Figure 2. Zenoss Installer Screen Location</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-location-2.png" alt="Zenoss Installer Screen Location"></div></div></div><br class="figure-break"><p>Click Forward.</p></li><li><p>The next Installer s!
creen appears prompting you for the MySQL password information!
.</p><p>
</p><div class="figure"><a name="d0e156"></a><p class="title"><b>Figure 3. Zenoss Installer Screen - MySQL Password</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-MySQL-3.png" alt="Zenoss Installer Screen - MySQL Password"></div></div></div><br class="figure-break"><p>The root password for MySQL is for a fresh installation of MySQL dedicated exclusively to Zenoss and not the root password for the computer, or the root password to any existing MySQL installation. You may use any non-empty password, this password is not stored by the Zenoss installer.</p><p>Click Forward.</p></li><li><p>You are now ready to Install Zenoss.</p><div class="figure"><a name="d0e169"></a><p class="title"><b>Figure 4. Zenoss Installer Screen - Ready to Install</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-ready-4.png" alt="Zenoss Installer Screen - Ready to Install"></di!
v></div></div><br class="figure-break"><p>Click forward to start the install process.</p><div class="figure"><a name="d0e177"></a><p class="title"><b>Figure 5. Zenoss Installer Screen - Progress Bar</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-progress-6.png" alt="Zenoss Installer Screen - Progress Bar"></div></div></div><br class="figure-break"><p>This point in the installation process may take several minutes without showing any change. Note that there is a long pause near the end of the installation as Zenoss is initializing itself. This wait may take several minutes.</p><p></p></li><li><p>When installation is complete you will see the following dialog.</p><div class="figure"><a name="d0e189"></a><p class="title"><b>Figure 6. Zenoss Installer Screen - Finish and Launch Zenoss</b></p><div class="figure-contents"><div class="mediaobject"><img src="resources/Installer_Screenshot-finish-7.png" alt="!
Zenoss Installer Screen - Finish and Launch Zenoss"></div></di!
v></div>
<br class="figure-break"><p>If you select "Launch Zenoss" the installer will attempt to run your web browser and point it to Zenoss. If this fails (usually because your browser is already running), just use the URL scheme discussed in step 3 above.</p></li></ol></div></div></body></html>
\ No newline at end of file
Modified: trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml
===================================================================
--- trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml 2008-05-19 12:08:56 UTC (rev 9283)
+++ trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml 2008-05-19 12:13:07 UTC (rev 9284)
@@ -11,8 +11,9 @@
<para></para>
<para>NOTE: If you are upgrading from a previous Zenoss installation that
- was not a stack installer, please follow the instructions in
- XXXXXXXXXXXXXX</para>
+ was not a stack installer, please follow the instructions in the document
+ named "UPGRADE_FROM_SOURCE_TO _INSTALL_STACK.txt" which is also available
+ from the Zenoss website.</para>
<para></para>
@@ -56,7 +57,7 @@
<listitem>
<para>Execute the installer as root. If you know your root
- password, use the su command: </para>
+ password, use the su command:</para>
<programlisting>$ su root -c ./zenoss*.bin</programlisting>
@@ -69,7 +70,7 @@
<listitem>
<para>Answer the installation prompts (as described starting in
step 3 below). The package will be installed in
- /usr/local/zenoss. </para>
+ /usr/local/zenoss.</para>
<para></para>
</listitem>
@@ -93,7 +94,7 @@
<para><programlisting>$ /usr/local/zenoss/zenconsole</programlisting>to
enter a shell with the Zenoss environment. You can then
start/stop daemons, enter zendmd, and perform other command line
- tasks. </para>
+ tasks.</para>
<para></para>
</listitem>
@@ -101,27 +102,26 @@
</listitem>
<listitem>
- <para>Opening the Installer in KDE </para>
+ <para>Opening the Installer in KDE</para>
<orderedlist>
<listitem>
<para>Make the file executable. Locate the downloaded file, and
- right-click on it, and select the "Properties" menu item.
- </para>
+ right-click on it, and select the "Properties" menu item.</para>
<para></para>
</listitem>
<listitem>
<para>Select the "Permissions" tab and check the "Is executable"
- check box. Select "Ok" to close the dialog. </para>
+ check box. Select "Ok" to close the dialog.</para>
<para></para>
</listitem>
<listitem>
<para>Run the program as root. Right click on the file and
- select the "Open With ..." menu item. </para>
+ select the "Open With ..." menu item.</para>
<para></para>
</listitem>
@@ -141,8 +141,7 @@
<orderedlist>
<listitem>
<para>Make the file executable. Locate the downloaded file, and
- right-click on it, and select the "Properties" menu item.
- </para>
+ right-click on it, and select the "Properties" menu item.</para>
<para></para>
</listitem>
@@ -156,7 +155,7 @@
<listitem>
<para>Run the program as root. Right click on the file and
- select the "Open with Other Application..." menu item. </para>
+ select the "Open with Other Application..." menu item.</para>
<para></para>
</listitem>
@@ -200,7 +199,7 @@
<para>If you already had something using port 8080, you will be prompted
for a new port on installation. For example, if you installed on your
local computer, and selected port 8888 as the new port for the Zope
- server, you would use the following url: http://localhost:8888 </para>
+ server, you would use the following url: http://localhost:8888</para>
<para></para>
@@ -294,7 +293,7 @@
<para>This point in the installation process may take several minutes
without showing any change. Note that there is a long pause near the end
of the installation as Zenoss is initializing itself. This wait may take
- several minutes. </para>
+ several minutes.</para>
<para></para>
</listitem>
|
|
From: <sv...@ze...> - 2008-05-19 12:08:54
|
Author: ian
Date: 2008-05-19 08:08:56 -0400 (Mon, 19 May 2008)
New Revision: 9283
Modified:
trunk/inst/docs/INSTALL_DEB_STACK.txt
Log:
* Fixed typo in install docs
Modified: trunk/inst/docs/INSTALL_DEB_STACK.txt
===================================================================
--- trunk/inst/docs/INSTALL_DEB_STACK.txt 2008-05-19 02:52:29 UTC (rev 9282)
+++ trunk/inst/docs/INSTALL_DEB_STACK.txt 2008-05-19 12:08:56 UTC (rev 9283)
@@ -9,7 +9,7 @@
Alternatively, you can add the Zenoss repository to /etc/apt/sources.list:
# Zenoss repository
- deb http://dev.zenoss.org/deb stable
+ deb http://dev.zenoss.org/deb main stable
Then:
|
|
From: <sv...@ze...> - 2008-05-19 02:59:06
|
Author: abray Date: 2008-05-18 22:52:29 -0400 (Sun, 18 May 2008) New Revision: 9282 Added: trunk/zendocs/Install/ trunk/zendocs/Install/StackInstall/ trunk/zendocs/Install/StackInstall/Installer_Screenshot-MySQL-3.png trunk/zendocs/Install/StackInstall/Installer_Screenshot-finish-7.png trunk/zendocs/Install/StackInstall/Installer_Screenshot-location-2.png trunk/zendocs/Install/StackInstall/Installer_Screenshot-progress-6.png trunk/zendocs/Install/StackInstall/Installer_Screenshot-ready-4.png trunk/zendocs/Install/StackInstall/Installer_Screenshot-welcome-1.png trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml trunk/zendocs/Install/StackInstall/html.css trunk/zendocs/Install/StackInstall/images/ trunk/zendocs/Install/StackInstall/images/callouts/ trunk/zendocs/Install/StackInstall/images/callouts/1.png trunk/zendocs/Install/StackInstall/images/callouts/10.png trunk/zendocs/Install/StackInstall/images/callouts/11.png trunk/zendocs/Install/StackInstall/images/callouts/12.png trunk/zendocs/Install/StackInstall/images/callouts/13.png trunk/zendocs/Install/StackInstall/images/callouts/14.png trunk/zendocs/Install/StackInstall/images/callouts/15.png trunk/zendocs/Install/StackInstall/images/callouts/2.png trunk/zendocs/Install/StackInstall/images/callouts/3.png trunk/zendocs/Install/StackInstall/images/callouts/4.png trunk/zendocs/Install/StackInstall/images/callouts/5.png trunk/zendocs/Install/StackInstall/images/callouts/6.png trunk/zendocs/Install/StackInstall/images/callouts/7.png trunk/zendocs/Install/StackInstall/images/callouts/8.png trunk/zendocs/Install/StackInstall/images/callouts/9.png trunk/zendocs/Install/StackInstall/images/draft.png trunk/zendocs/Install/StackInstall/resources/ trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-MySQL-3.png trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-finish-7.png trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-location-2.png trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-progress-6.png trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-ready-4.png trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-welcome-1.png trunk/zendocs/Install/StackInstall/resources/setup1.png trunk/zendocs/Install/StackInstall/resources/setup2.png Log: checking in stack installer doc directory -drew Added: trunk/zendocs/Install/StackInstall/Installer_Screenshot-MySQL-3.png Property changes on: trunk/zendocs/Install/StackInstall/Installer_Screenshot-MySQL-3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/Installer_Screenshot-finish-7.png Property changes on: trunk/zendocs/Install/StackInstall/Installer_Screenshot-finish-7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/Installer_Screenshot-location-2.png Property changes on: trunk/zendocs/Install/StackInstall/Installer_Screenshot-location-2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/Installer_Screenshot-progress-6.png Property changes on: trunk/zendocs/Install/StackInstall/Installer_Screenshot-progress-6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/Installer_Screenshot-ready-4.png Property changes on: trunk/zendocs/Install/StackInstall/Installer_Screenshot-ready-4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/Installer_Screenshot-welcome-1.png Property changes on: trunk/zendocs/Install/StackInstall/Installer_Screenshot-welcome-1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/ZenossStackInstallers.html Added: trunk/zendocs/Install/StackInstall/ZenossStackInstallers.xml Added: trunk/zendocs/Install/StackInstall/html.css Added: trunk/zendocs/Install/StackInstall/images/callouts/1.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/10.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/10.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/11.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/11.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/12.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/12.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/13.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/13.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/14.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/14.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/15.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/15.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/2.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/3.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/4.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/5.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/6.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/7.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/8.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/callouts/9.png Property changes on: trunk/zendocs/Install/StackInstall/images/callouts/9.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/images/draft.png Property changes on: trunk/zendocs/Install/StackInstall/images/draft.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-MySQL-3.png Property changes on: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-MySQL-3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-finish-7.png Property changes on: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-finish-7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-location-2.png Property changes on: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-location-2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-progress-6.png Property changes on: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-progress-6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-ready-4.png Property changes on: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-ready-4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-welcome-1.png Property changes on: trunk/zendocs/Install/StackInstall/resources/Installer_Screenshot-welcome-1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/resources/setup1.png Property changes on: trunk/zendocs/Install/StackInstall/resources/setup1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/Install/StackInstall/resources/setup2.png Property changes on: trunk/zendocs/Install/StackInstall/resources/setup2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ze...> - 2008-05-19 02:16:28
|
Author: marc Date: 2008-05-18 22:16:36 -0400 (Sun, 18 May 2008) New Revision: 9281 Modified: trunk/inst/docs/UPGRADE.txt Log: * Updated UPGRADE.txt with Appliance upgrade instructions for 2.2.x Modified: trunk/inst/docs/UPGRADE.txt =================================================================== --- trunk/inst/docs/UPGRADE.txt 2008-05-16 20:49:03 UTC (rev 9280) +++ trunk/inst/docs/UPGRADE.txt 2008-05-19 02:16:36 UTC (rev 9281) @@ -34,13 +34,23 @@ ** Zenoss Virtual Appliance Image -Login as root, thes switch to the zenoss user: -root# su - zenoss +Login as the root user. -Run appliance_update.sh: -zenoss$ ./appliance_update.sh +Make a backup of your data using zenbackup +Then run this command one of the following commands. If you would like to upgrade to the beta version of Zenoss, run this command: +root# conary migrate --interactive group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@zenoss:core-beta + +If you would like to upgrade to the 2.2.x version of Zenoss, run this command: + +root# conary migrate --interactive group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@zenoss:core-2.2 + +If you would like to upgrade to the 2.1.x version of Zenoss, run this command: + +root# conary migrate --interactive group-zenoss=zenoss-project.zenoss.loc=zenoss-project.zenoss.loc@zenoss:core + + ** Source tarball Download and extract new tar ball, run install.sh: |
|
From: <sv...@ze...> - 2008-05-16 20:49:11
|
Author: ian
Date: 2008-05-16 16:49:03 -0400 (Fri, 16 May 2008)
New Revision: 9280
Modified:
sandboxen/jplouis/Products-remoteStuff/DataCollector/zendisc.py
Log:
* Refs #550: If IP is associated with an existing device, exit with exit code 3
Modified: sandboxen/jplouis/Products-remoteStuff/DataCollector/zendisc.py
===================================================================
--- sandboxen/jplouis/Products-remoteStuff/DataCollector/zendisc.py 2008-05-16 19:18:40 UTC (rev 9279)
+++ sandboxen/jplouis/Products-remoteStuff/DataCollector/zendisc.py 2008-05-16 20:49:03 UTC (rev 9280)
@@ -11,6 +11,7 @@
#
###########################################################################
+import sys
import socket
import Globals
@@ -271,6 +272,8 @@
if not self.options.remodel:
self.log.info("ip '%s' on device '%s' skipping",
ip, dev.id)
+ if self.options.device:
+ sys.exit(3)
yield succeed(dev)
driver.next()
return
|
|
From: <sv...@ze...> - 2008-05-16 19:19:19
|
Author: ecn Date: 2008-05-16 15:18:40 -0400 (Fri, 16 May 2008) New Revision: 9279 Modified: trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt Log: * clarify instructions and wrap to 70 characters Modified: trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt =================================================================== --- trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt 2008-05-16 18:27:53 UTC (rev 9278) +++ trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt 2008-05-16 19:18:40 UTC (rev 9279) @@ -1,12 +1,16 @@ -Here are the steps for upgrading from a source-based install to a zenoss-stack .deb or rpm. +Here are the steps for upgrading from a source-based install to a +zenoss-stack .deb or rpm. - 1. Fetch the zenoss .deb (for debian and ubuntu systems) or .rpm for redhat, - SuSE. +Note, that for all the commands below, the prompt "#" is used to mean +"run as root" and "$" for the zenoss user. - 2. The zenoss stack includes it's own copy of mysql, which, by default, will - run on port 3307. Change your current configuration to point to port - 3307. + 1. Fetch the zenoss .deb (for debian and ubuntu systems) or .rpm + for redhat, SuSE. + 2. The zenoss stack includes it's own copy of mysql, which, by + default, will run on port 3307. Change your current configuration + to point to port 3307. + Event Manager -> Edit, change the port from 3306 to 3307 3. Back everything up @@ -39,8 +43,9 @@ 9. Load your data back with zenrestore: + $ NOW=`date +%Y%m%d` $ zenrestore --dbuser=zenoss --dbpass=zenoss \ - --file /usr/local/zenoss-2.1.3/backups/zenbackup_`date +%Y%m%d`.tgz + --file /usr/local/zenoss-2.1.3/backups/zenbackup_$NOW.tgz 10. Copy the configuration files back: |
|
From: <sv...@ze...> - 2008-05-16 18:28:14
|
Author: ecn Date: 2008-05-16 14:27:53 -0400 (Fri, 16 May 2008) New Revision: 9278 Modified: trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt Log: remove extra zenoss start command Modified: trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt =================================================================== --- trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt 2008-05-16 17:40:17 UTC (rev 9277) +++ trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt 2008-05-16 18:27:53 UTC (rev 9278) @@ -33,9 +33,9 @@ $ cd /usr/local/zenoss/zenoss/etc $ cp zeo.conf zope.conf /tmp - 8. Start zenoss + 8. Start mysql - # /etc/init.d/zenoss-stack start + # /usr/local/zenoss/mysql/scripts/ctl.sh start 9. Load your data back with zenrestore: @@ -47,20 +47,15 @@ $ cp /tmp/zope.conf /usr/local/zenoss/zenoss/etc $ cp /tmp/zeo.conf /usr/local/zenoss/zenoss/etc -11. Stop zenoss: +11. Start zeo - $ zenoss stop - $ pkill -f zeo - -12. Start zeo - $ zeoctl start -13. Migrate the data: +12. Migrate the data: $ zenmigrate -14. Re-register the portlets +13. Re-register the portlets $ zendmd >>> from Products.ZenWidgets.ZenossPortlets.ZenossPortlets \ @@ -68,6 +63,6 @@ >>> register_default_portlets(zport.ZenPortletManager) >>> commit() -15. Start all of zenoss: +14. Start all of zenoss: $ zenoss start |
|
From: <sv...@ze...> - 2008-05-16 17:40:40
|
Author: jstevens Date: 2008-05-16 13:40:17 -0400 (Fri, 16 May 2008) New Revision: 9277 Modified: trunk/inst/docs/UPGRADE.txt Log: * Changing instructions to us --no-deps instead of --force when upgrading core rpm and zenpacks rpm is present. Modified: trunk/inst/docs/UPGRADE.txt =================================================================== --- trunk/inst/docs/UPGRADE.txt 2008-05-16 17:32:14 UTC (rev 9276) +++ trunk/inst/docs/UPGRADE.txt 2008-05-16 17:40:17 UTC (rev 9277) @@ -21,7 +21,7 @@ root# service zenoss stop Install the RPM. (Note - if you have the zenoss-core-zenpacks rpm already -installed you may need to use the --force option with this rpm command.) +installed you may need to use the --nodeps option with this rpm command.) root# rpm -Uvh zenoss-<version>.rpm Start Zenoss: |
|
From: <sv...@ze...> - 2008-05-16 17:32:21
|
Author: jstevens
Date: 2008-05-16 13:32:14 -0400 (Fri, 16 May 2008)
New Revision: 9276
Modified:
trunk/inst/docs/UPGRADE.txt
Log:
* Put the more popular install/upgrade methods near the top
* Removed some steps that are no longer necessary
* Several steps more concisely worded
* Added comments regarding the zenoss-core-zenpacks RPM
Modified: trunk/inst/docs/UPGRADE.txt
===================================================================
--- trunk/inst/docs/UPGRADE.txt 2008-05-16 15:46:53 UTC (rev 9275)
+++ trunk/inst/docs/UPGRADE.txt 2008-05-16 17:32:14 UTC (rev 9276)
@@ -1,72 +1,66 @@
-Upgrade to new version of Zenoss
+This document describes the steps necessary to upgrade a Zenoss installation
+to a newer version. There are three sections below with cover the steps
+necessary for each different method of installing Zenoss. Follow the
+directions that correspon to how you installed your existing version of
+Zenoss:
+ * EL4 or EL5 RPM
+ * Zenoss Virtual Appliance
+ * Source tarball
+ * Subversion checkout
-There are separate sections below for: * Upgrading using the tar ball *
-Upgrading an rpm installation * Upgrading the virtual appliance image
+NOTE: You should always backup your zenoss data prior to upgrading. The
+easiest way to do this is to use zenbackup and save the backup file somewhere
+other than within $ZENHOME:
+zenoss$ zenbackup --save-mysql-access --file /tmp/zenoss-backup.tgz
-Please follow the directions appropriate for your installation.
+** EL4 or EL5 RPMs
-** Upgrade using tar ball
+Download the new RPM from SourceForge and become root. Then shutdown
+your existing zenoss install:
+root# service zenoss stop
-Download and extract new tar ball, run install.sh: # tar zxf zenoss-1.1.0.tar.gz
-# cd zenoss-1.1.0 # ./install.sh
+Install the RPM. (Note - if you have the zenoss-core-zenpacks rpm already
+installed you may need to use the --force option with this rpm command.)
+root# rpm -Uvh zenoss-<version>.rpm
+Start Zenoss:
+root# service zenoss start
-** Upgrade the RPM to a new version
+OPTIONAL: Retrieve zenoss-core-zenpacks-<version>.rpm from SourceForge
+and install it:
+root# rpm -Uhv zenoss-core-zenpacks-<version>.rpm
-Download the new RPM from SourceForge and become root. Shut down the existing
-Zenoss server using this command (run as root): # /etc/init.d/zenoss stop # ps
-auxww | grep zenoss
-After running the ps command you should only see some MySQL processes. The RPM
-will kill off any zenoss processes it sees running (except for the MySQL ones),
-but it does so using the kill command. Using the above code gracefully shuts
-down zenoss, and it is highly recommended you run the {{{/etc/init.d/zenoss
-stop}}} and {{{ps auxww | grep zenoss}}} commands before proceeding to the next
-step: upgrade.
+** Zenoss Virtual Appliance Image
-First lay down the new files contained within the RPM and then start up zenoss.
-The following commands illustrate (run them as root): # rpm -Uvh
-zenoss-1.1.0-0.i386.rpm # service zenoss start
+Login as root, thes switch to the zenoss user:
+root# su - zenoss
+Run appliance_update.sh:
+zenoss$ ./appliance_update.sh
-** Updating the Zenoss Virtual Appliance Image
-Login as the zenoss user. To log in as the zenoss user, when prompted for log
-in, first, log in as root, then enter the command to log in as the zenoss user:
-# su - zenoss
+** Source tarball
-Make a backup of your data. Use the following command to create a copy of
-ZENHOME: # cd $ZENHOME # tar -czvf /tmp/zenoss-var.tar.gz ./var
+Download and extract new tar ball, run install.sh:
+zenoss$ tar zxf zenoss-<version>.tar.gz
+zenoss$ cd zenoss-<version>
+zenoss$ ./install.sh
-Run appliance_update.sh # ./appliance_update.sh
+** Subversion source checkout
-** Upgrade a trunk based install
+If you have a subversion checkout of the Zenoss installer code then update it:
+root# cd <your inst directory>
+root# svn update
+otherwise retrieve a copy of the install code:
+root# http://dev.zenoss.org/svn/trunk/inst zenossinst
+root# cd zenossinst
-Login as the zenoss user. To log in as the zenoss user, when prompted for log
-in, first, log in as root, then enter the command to log in as the zenoss user:
-# su - zenoss
+Run the install script:
+root# ./install.sh
-Make a backup of your data. Use the following command to create a copy of
-ZENHOME: # cd $ZENHOME # tar -czvf /tmp/zenoss.tar.gz .
-
-Retrieve the latest install scripts: # svn co
-http://dev.zenoss.org/svn/trunk/inst zenossinst
-
-Install zenoss from its install directory: # cd zenossinst (wherever you checked
-out the inst dir) # ./install.sh
-
-If install fails, cleanup and restore with: # make clean # tar -xzvf
-/tmp/zenoss.tar.gz
-
-
-** Switch from a tarball or rpm based install to a trunk based install
-
-Use zenbackup.py to create a .tgz file containing a dump of Zenoss data and
-configurations: # cd $ZENHOME # tar zcf /tmp/zenhome.tgz .
-
-Retrieve the latest install scripts: # cd /home/zenoss (or other non-$ZENHOME
-directory) # svn co http://dev.zenoss.org/svn/trunk/inst zenossinst
-
-Install zenoss from its install directory: # cd zenossinst # ./install.sh
+After install is complete migrate your data as the zenoss user:
+root# su - zenoss
+zenoss$ zenmigrate
|
|
From: <sv...@ze...> - 2008-05-16 15:51:24
|
Author: ecn Date: 2008-05-16 11:46:53 -0400 (Fri, 16 May 2008) New Revision: 9275 Added: trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt Removed: trunk/inst/docs/UPGRADE_FROM_SOURCE.txt Log: rename file Deleted: trunk/inst/docs/UPGRADE_FROM_SOURCE.txt Copied: trunk/inst/docs/UPGRADE_FROM_SOURCE_TO_INSTALL_STACK.txt (from rev 9274, trunk/inst/docs/UPGRADE_FROM_SOURCE.txt) |
|
From: <sv...@ze...> - 2008-05-16 15:44:53
|
Author: ecn
Date: 2008-05-16 11:44:56 -0400 (Fri, 16 May 2008)
New Revision: 9274
Modified:
trunk/inst/docs/UPGRADE_FROM_SOURCE.txt
Log:
instructions for upgrading from source to a binary stack installer
Modified: trunk/inst/docs/UPGRADE_FROM_SOURCE.txt
===================================================================
--- trunk/inst/docs/UPGRADE_FROM_SOURCE.txt 2008-05-16 14:28:49 UTC (rev 9273)
+++ trunk/inst/docs/UPGRADE_FROM_SOURCE.txt 2008-05-16 15:44:56 UTC (rev 9274)
@@ -23,7 +23,7 @@
6. Install the package:
- # dpkg -i zenoss-stack*.dep
+ # dpkg -i zenoss-stack*.deb
or
# rpm -Uvh zenoss-stack*.rpm
@@ -31,8 +31,7 @@
7. Copy the configuration files to a backup directory:
$ cd /usr/local/zenoss/zenoss/etc
- $ mkdir /tmp/backup
- $ cp * /tmp/backup
+ $ cp zeo.conf zope.conf /tmp
8. Start zenoss
@@ -40,27 +39,35 @@
9. Load your data back with zenrestore:
- $ zenrestore --dbuser=zenoss --dbpass=zenoss --file /usr/local/zenoss-2.1.3/backups/zenbackup_`date +%Y%m%d`.tgz
+ $ zenrestore --dbuser=zenoss --dbpass=zenoss \
+ --file /usr/local/zenoss-2.1.3/backups/zenbackup_`date +%Y%m%d`.tgz
10. Copy the configuration files back:
- $ cp /tmp/backup/zope.conf /usr/local/zenoss/zenoss/etc
- $ cp /tmp/backup/zeo.conf /usr/local/zenoss/zenoss/etc
+ $ cp /tmp/zope.conf /usr/local/zenoss/zenoss/etc
+ $ cp /tmp/zeo.conf /usr/local/zenoss/zenoss/etc
-11. Restart zenoss:
+11. Stop zenoss:
$ zenoss stop
- $ pkill -f zenoss
- $ zenoss start
+ $ pkill -f zeo
-12. Migrate the data:
+12. Start zeo
+ $ zeoctl start
+
+13. Migrate the data:
+
$ zenmigrate
-13. Re-register the portlets
+14. Re-register the portlets
$ zendmd
>>> from Products.ZenWidgets.ZenossPortlets.ZenossPortlets \
import register_default_portlets
- >>> register_default_portlets((zport.ZenPortletManager)
+ >>> register_default_portlets(zport.ZenPortletManager)
>>> commit()
+
+15. Start all of zenoss:
+
+ $ zenoss start
|
|
From: <sv...@ze...> - 2008-05-16 14:28:48
|
Author: ecn Date: 2008-05-16 10:28:49 -0400 (Fri, 16 May 2008) New Revision: 9273 Added: trunk/inst/docs/UPGRADE_FROM_SOURCE.txt Log: instructions for upgrading from source to a binary stack installer Added: trunk/inst/docs/UPGRADE_FROM_SOURCE.txt |
|
From: <sv...@ze...> - 2008-05-15 22:33:51
|
Author: jplouis
Date: 2008-05-15 18:33:59 -0400 (Thu, 15 May 2008)
New Revision: 9272
Modified:
sandboxen/jplouis/Products-remoteStuff/DataCollector/zendisc.py
Log:
add passed in community arg to list of configured communities instead of overriding.
Modified: sandboxen/jplouis/Products-remoteStuff/DataCollector/zendisc.py
===================================================================
--- sandboxen/jplouis/Products-remoteStuff/DataCollector/zendisc.py 2008-05-15 22:33:09 UTC (rev 9271)
+++ sandboxen/jplouis/Products-remoteStuff/DataCollector/zendisc.py 2008-05-15 22:33:59 UTC (rev 9272)
@@ -165,7 +165,7 @@
if self.options.zSnmpVer: version = self.options.zSnmpVer
if self.options.zSnmpPort: port = self.options.zSnmpPort
if self.options.zSnmpCommunity:
- communities = (self.options.zSnmpCommunity,)
+ communities = (self.options.zSnmpCommunity,) + communities
versions = ("v2c", "v1")
if '1' in version:
|
|
From: <sv...@ze...> - 2008-05-15 22:33:03
|
Author: jplouis
Date: 2008-05-15 18:33:09 -0400 (Thu, 15 May 2008)
New Revision: 9271
Modified:
sandboxen/jplouis/Products-remoteStuff/ZenModel/PerformanceConf.py
Log:
pass snmp community to zendisc command. sync with zeodb to find device added by zendisc
Modified: sandboxen/jplouis/Products-remoteStuff/ZenModel/PerformanceConf.py
===================================================================
--- sandboxen/jplouis/Products-remoteStuff/ZenModel/PerformanceConf.py 2008-05-15 22:30:50 UTC (rev 9270)
+++ sandboxen/jplouis/Products-remoteStuff/ZenModel/PerformanceConf.py 2008-05-15 22:33:09 UTC (rev 9271)
@@ -54,7 +54,7 @@
from Products.ZenUtils.Utils import clearWebLoggingStream
from Products.ZenModel.Exceptions import DeviceExistsError
from Products.ZenUtils.IpUtil import isip
-from Device import manage_createDevice
+from Products.ZenModel.Device import manage_createDevice
from StatusColor import StatusColor
@@ -402,62 +402,74 @@
device = None
- try:
- device = self._createDevice(deviceName, devicePath, productionState,
- performanceMonitor, discoverProto, zSnmpPort, REQUEST)
-#need to call zendisc and interpret exit codes? Then update properties.
-
- if device:
- kw = dict(tag=tag,
- serialNumber=serialNumber,
- rackSlot=rackSlot,
- prodauctionState=productionState,
- comments=comments,
- hwManufacturer=hwManufacturer,
- hwProductName = hwProductName,
- osManufacturer = osManufacturer,
- osProductName = osProductName,
- locationPath = locationPath,
- groupPaths = groupPaths,
- systemPaths = systemPaths,
- performanceMonitor = performanceMonitor,
- priority = priority)
- device.manage_editDevice(**kw)
- else:
- log.info("no device returned")
+ if discoverProto == "none":
+ device = manage_createDevice(self, deviceName, devicePath,
+ tag, serialNumber,
+ zSnmpCommunity, zSnmpPort, zSnmpVer,
+ rackSlot, productionState, comments,
+ hwManufacturer, hwProductName,
+ osManufacturer, osProductName,
+ locationPath, groupPaths, systemPaths,
+ performanceMonitor, discoverProto)
+ else:
+ try:
+ device = self._createDevice(deviceName, devicePath, productionState,
+ performanceMonitor, discoverProto, zSnmpPort, zSnmpCommunity, REQUEST)
+ #need to call zendisc and interpret exit codes? Then update properties.
- except Exception: raise
+ if device:
+ kw = dict(tag=tag,
+ serialNumber=serialNumber,
+ rackSlot=rackSlot,
+ productionState=productionState,
+ comments=comments,
+ hwManufacturer=hwManufacturer,
+ hwProductName = hwProductName,
+ osManufacturer = osManufacturer,
+ osProductName = osProductName,
+ locationPath = locationPath,
+ groupPaths = groupPaths,
+ systemPaths = systemPaths,
+ performanceMonitor = performanceMonitor,
+ priority = priority)
+ device.manage_editDevice(**kw)
+ else:
+ log.info("no device returned")
+
+ except Exception: raise
return device
def _createDevice(self, deviceName, devicePath= "/Discovered",
productionState=1000, performanceMonitor="localhost",
- discoverProto="snmp", zSnmpPort=161,REQUEST=None):
+ discoverProto="snmp", zSnmpPort=161,zSnmpCommunity="", REQUEST=None):
"""
Actual implementation for creating/adding a device to the system.
"""
- xmlrpc = isXmlRpc(REQUEST)
-
- '''
- todo add snmp variables
- '''
-
zm = zenPath('bin', 'zendisc')
zendiscCmd = [zm, 'run', '--now','-d', deviceName,
'--monitor', performanceMonitor,
'--deviceclass', devicePath,
'--snmp-port', str(zSnmpPort) ]
+ if zSnmpCommunity != "":
+ zendiscCmd.extend(["--snmp-community", zSnmpCommunity])
+
+
if REQUEST: zendiscCmd.append("--weblog")
-
result = executeCommand(zendiscCmd, REQUEST)
-
log.info("zendisc result : %s" % result)
-
+ self.dmd._p_jar.sync()
device = self.getDmdRoot("Devices").findDevice(deviceName)
+ if not device:
+ raise Exception("ZenDisc did not create device %s" % deviceName)
return device
-
+ def _executeZenDiscCommand(self, zendiscCmd, REQUEST=None):
+ """
+ execute a the given zendisc command and return reslut
+ """
+ return executeCommand(zendiscCmd, REQUEST)
def collectDevice(self, device=None, setlog=True, REQUEST=None, generateEvents=False):
"""
|
|
From: <sv...@ze...> - 2008-05-15 22:30:42
|
Author: jplouis
Date: 2008-05-15 18:30:50 -0400 (Thu, 15 May 2008)
New Revision: 9270
Modified:
sandboxen/jplouis/Products-remoteStuff/ZenModel/skins/zenmodel/addDevice.pt
Log:
removed "snmp" option from discovery protocol list and replace with "auto"
Modified: sandboxen/jplouis/Products-remoteStuff/ZenModel/skins/zenmodel/addDevice.pt
===================================================================
--- sandboxen/jplouis/Products-remoteStuff/ZenModel/skins/zenmodel/addDevice.pt 2008-05-15 18:06:17 UTC (rev 9269)
+++ sandboxen/jplouis/Products-remoteStuff/ZenModel/skins/zenmodel/addDevice.pt 2008-05-15 22:30:50 UTC (rev 9270)
@@ -58,7 +58,7 @@
<td class="tableheader" align="left">Discovery Protocol</td>
<td class="tablevalues" align="left" >
<select class="tablevalues" name="discoverProto">
- <option value="snmp">snmp</option>
+ <option value="auto">auto</option>
<!--
<option value="ssh">ssh</option>
<option value="portscan">portscan</option>
|
|
From: <sv...@ze...> - 2008-05-15 18:13:54
|
Author: edahl Date: 2008-05-15 14:05:23 -0400 (Thu, 15 May 2008) New Revision: 9268 Modified: trunk/bin/zenchkschema Log: * make this script work again Modified: trunk/bin/zenchkschema =================================================================== --- trunk/bin/zenchkschema 2008-05-15 15:36:30 UTC (rev 9267) +++ trunk/bin/zenchkschema 2008-05-15 18:05:23 UTC (rev 9268) @@ -10,4 +10,4 @@ # For complete information please visit: http://www.zenoss.com/oss/ ############################################################################# . $ZENHOME/bin/zenfunctions -$PYTHON $ZENHOME/Products/ZenRelations/checkrel.py $* +$PYTHON $ZENHOME/Products/ZenRelations/checkrel.py "$CMD" $* |
|
From: <sv...@ze...> - 2008-05-15 18:13:24
|
Author: edahl
Date: 2008-05-15 14:06:17 -0400 (Thu, 15 May 2008)
New Revision: 9269
Modified:
trunk/Products/ZenModel/RRDThreshold.py
Log:
* remove relationship on class that isn't used anymore
Modified: trunk/Products/ZenModel/RRDThreshold.py
===================================================================
--- trunk/Products/ZenModel/RRDThreshold.py 2008-05-15 18:05:23 UTC (rev 9268)
+++ trunk/Products/ZenModel/RRDThreshold.py 2008-05-15 18:06:17 UTC (rev 9269)
@@ -57,9 +57,9 @@
{'id':'enabled', 'type':'boolean', 'mode':'w'},
)
- _relations = ZenPackable._relations + (
- ("rrdTemplate", ToOne(ToManyCont,"Products.ZenModel.RRDTemplate", "thresholds")),
- )
+# _relations = ZenPackable._relations + (
+# ("rrdTemplate", ToOne(ToManyCont,"Products.ZenModel.RRDTemplate", "thresholds")),
+# )
factory_type_information = (
|
|
From: <sv...@ze...> - 2008-05-15 15:36:29
|
Author: ecn
Date: 2008-05-15 11:36:30 -0400 (Thu, 15 May 2008)
New Revision: 9267
Modified:
sandboxen/jplouis/Products-remoteStuff/ZenRRD/RRDDaemon.py
sandboxen/jplouis/Products-remoteStuff/ZenRRD/zenprocess.py
Log:
fixes #3143: zenprocess timeouts are ugly
Modified: sandboxen/jplouis/Products-remoteStuff/ZenRRD/RRDDaemon.py
===================================================================
--- sandboxen/jplouis/Products-remoteStuff/ZenRRD/RRDDaemon.py 2008-05-15 15:13:00 UTC (rev 9266)
+++ sandboxen/jplouis/Products-remoteStuff/ZenRRD/RRDDaemon.py 2008-05-15 15:36:30 UTC (rev 9267)
@@ -97,7 +97,10 @@
def logError(self, msg, error):
if isinstance(error, failure.Failure):
- self.log.exception(error)
+ if isinstance(error.value, error.TimeoutError):
+ self.log.warning("Timeout Error")
+ else:
+ self.log.exception(error)
else:
self.log.error('%s %s', msg, error)
Modified: sandboxen/jplouis/Products-remoteStuff/ZenRRD/zenprocess.py
===================================================================
--- sandboxen/jplouis/Products-remoteStuff/ZenRRD/zenprocess.py 2008-05-15 15:13:00 UTC (rev 9266)
+++ sandboxen/jplouis/Products-remoteStuff/ZenRRD/zenprocess.py 2008-05-15 15:36:30 UTC (rev 9267)
@@ -562,9 +562,9 @@
def storePerfStats(self, results, device):
"Save the performance data in RRD files"
- for result in results:
- if not result[0]:
- self.error(results)
+ for success, result in results:
+ if not success:
+ self.error(result)
return results
self.clearSnmpError(device.name,
'Process table up for device %s' % device.name)
|
|
From: <sv...@ze...> - 2008-05-15 15:13:00
|
Author: ian Date: 2008-05-15 11:13:00 -0400 (Thu, 15 May 2008) New Revision: 9266 Added: tags/zenoss-2.2.0/ Log: * Sliding tag again Copied: tags/zenoss-2.2.0 (from rev 9265, branches/zenoss-2.2.x) |
|
From: <sv...@ze...> - 2008-05-15 15:12:23
|
Author: ian Date: 2008-05-15 11:12:31 -0400 (Thu, 15 May 2008) New Revision: 9265 Removed: tags/zenoss-2.2.0/ Log: * Removing in preparation for new tag |
