diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-09-07 17:25:25 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-09-07 17:25:25 +0530 |
| commit | e225f59bacc493a122e886d68ea68cb7f7a6bfb6 (patch) | |
| tree | 18f4656b38ff0798b20cf92a2f8d5d15b7aa203a /src | |
| parent | 2c4bb8a610406a5b4641c462f0f058c533d0f075 (diff) | |
| parent | 66ddede85d57046dc5a7728d200741ecfb2baca8 (diff) | |
Merge branch 'master' of github.com:gluster/console
Diffstat (limited to 'src')
53 files changed, 146 insertions, 406 deletions
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html index 577882a9..ff18004a 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html @@ -15,7 +15,7 @@ type="text/css" media="screen" /> <li>Open your web browser.
<p>Ensure that your web browser has cookies and Javascript enabled.</p>
<li>Type the following URL in your web browser:
-<p><FONT FACE = "Courier">http://server-name:8443/glustermg/</FONT></p>
+<p><FONT FACE = "Courier">https://server-name:8443/glustermg/</FONT></p>
<p>Gluster Management Console login window is displayed</p>
<p><img src="../images/GMC_Login_Window.jpg" alt="Login Window" />
<li>Type the following default user name and password in the login window:
@@ -31,8 +31,13 @@ type="text/css" media="screen" /> <li>Click <b>Change</b>. The system displays <b>Change Password</b> window
indicating that the password was successfully changed.
<p><img src="../images/GMC_Change_Password_Confirm.jpg" alt="Password Changed Successfully" /></p>
- <li>Click <b>OK</b>. The Gluster Management Console window is displayed.
- <p><b>Note:</b> You can change the password at any time by accessing <b>Edit</b> > <b>Change Password</b>.
+
+ <li>Click <b>OK</b>. The <b>Select Cluster</b> window is
+ displayed. You can now create a new cluster or register an existing
+ cluster. For more information on creating or registering clusters,
+ refer to <a href="manage_cluster.html">Managing Clusters</a>.
</ol>
+<p><b>Note:</b> You can change the password at any time by
+ accessing <b>Edit</b> > <b>Change Password</b>.
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html index 2bd9ff5e..d5189d98 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html @@ -20,7 +20,7 @@ following steps.</p> <li>Open your web browser.
<li>Type the following URL in your web browser:
<p><FONT FACE = "Courier">
- http://server-name:webserver-port/glustermg/gluster-management-console.jnlp
+ https://server-name:webserver-port/glustermg/
</FONT></p>
<p><b>Gluster Management Console</b> login window is displayed.</p>
<p><img src="../images/GMC_Change_Password.jpg" height="150" width="250" alt="Change Default Password" /></p>
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html index ec93d66a..76a44038 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html @@ -21,7 +21,7 @@ <h2>Web Browser Requirements</h2>
<ul>
<li>Use your JRE installer to configure your browser for Java Web Start. Also, ensure that you have configured your browser to open .jnlp files using the Java Web Start application or javaws exe located in bin folder of your JRE installation.
-<li>When you access the Gluster Management Console, Java Web Start downloads all required .jar files from the Gateway server and launches the console’s GUI. During this process, web start may display a certificate warning mentioning that the application is signed by Gluster, Inc.. This certificate is authentic, but it requires full permissions as the application contains features that require registering information on the client's hard disk such as exporting the security keys from gateway. You can accept the warning and select Always Trust Content from this Provider on your browser to avoid this warning every time you launch the application
+<li>When you access the Gluster Management Console, Java Web Start downloads all required .jar files from the Gateway server and launches the console's GUI. During this process, web start may display a certificate warning mentioning that the application is signed by Gluster, Inc.. This certificate is authentic, but it requires full permissions as the application contains features that require registering information on the client's hard disk such as exporting the security keys from gateway. You can accept the warning and select Always Trust Content from this Provider on your browser to avoid this warning every time you launch the application
</ul>
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html index 866b50ab..fa106b64 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html @@ -11,11 +11,13 @@ type="text/css" media="screen" /> <body>
<h1>Checking Gluster Management Gateway Minimum Requirements</h1>
Gluster Management Gateway is installed on a central server using the Linux package published by Gluster. Before you install Gluster Management Gateway, you must verify that your environment matches the minimum requirements described in this section.
-<p><b>Note:</b> For checking the GlusterFS minimum requirements, refer to the <a href= "http://www.gluster.com/community/documentation/index.php/Gluster_3.2:_Checking_Minimum_Requirements">Gluster 3.2 Filesystem Installation Guide, Checking Minimum Requirements</a>.</p>
+<p><b>Note:</b> For checking the GlusterFS minimum requirements, refer to the <a href= "http://www.gluster.com/community/documentation/index.php/Gluster_3.2:_Checking_Minimum_Requirements" target="_blank">Gluster 3.2 Filesystem Installation Guide, Checking Minimum Requirements</a>.</p>
<p>You must verify that your central server matches the minimum requirements listed below:</p>
<ul>
-<li>Memory: 2 GM RAM
-<li>Processor: 2 (2.4 GHz each) recommended; 64 bit<li>Disk Space: 10 GB
+<li>Memory: 2 GB RAM
+<li>Processor: 2 (2.4 GHz each) recommended; 64 bit
+<li>Disk Space: 10 GB
+<li> The gateway machine can be either Gluster Storage Software Appliance, Gluster Virtual Storage Appliance, or CentOS 5.6.
</ul>
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html index eccaa0f9..21ba31ec 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html @@ -22,22 +22,21 @@ type="text/css" media="screen" /> <p>To configure CIFS, you must create a text file consisting of a list of servers (hostnames or IP addresses).</p>
<p><b>Note:</b> You can configure CIFS on a fresh install or on an existing installation on the server which you have installed Gluster Management Gateway after adding the server to the cluster.</p>
<p>Run the following command on the gateway server to configure CIFS:</p>
-<p><FONT FACE = "Courier">$ grun.py <server list file>.txt setup_cifs_config.py</FONT></p>
+<p><FONT FACE = "Courier">$ setup_cifs_config_all.py <server list file></FONT></p>
<p><b>Note:</b> Ensure that CIFS services are configured on all the servers of your cluster at all times. Any new servers added to the cluster, ensure that you configure CIFS services on them. This enables you to access the CIFS enabled volumes from any of the cluster nodes.
<h2>Creating CIFS Users</h2>
<p>You must create users and their password to enable them to use the CIFS access protocol.</p>
<p>To create CIFS users, run the following on the gateway server:</p>
-<p><FONT FACE = "Courier">$ add_user_cifs_all.py <server list file> <user list file> <password></FONT></p>
+<p><FONT FACE = "Courier">$ add_user_cifs_all.py <server list file> <user name> <password></FONT></p>
<ul>
<li>Server list file – contains one server name per line
-<li>User list file – contains one user name per line
</ul>
-<p>All users defined in the <user list file> will be created on each and every server defined in <server list file>, will be assigned the same password defined in <password>.
-<p><b>Note:</b> Ensure that CIFS users are created on all the servers of your cluster at all times. Any new servers added to the cluster, ensure that you create all the CIFS users on them.
+<p>The user defined in the <user name> will be created on each and every server defined in <server list file>, will be assigned the same password defined in <password>.
+<p><b>Note:</b> Ensure that the CIFS user is created on all the servers of your cluster at all times which includes any new servers added to the cluster.
<h2>Removing CIFS Users</h2>
<p>You can delete users and their password.</p>
<p>To delete CIFS users, run the following on the gateway server:</p>
-<p><FONT FACE = "Courier">$ delete_user_cifs_all.py <server list> <user list></FONT></p>
+<p><FONT FACE = "Courier">$ delete_user_cifs_all.py <server list> <user name></FONT></p>
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html index 48c1f892..8aee7171 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html @@ -25,6 +25,6 @@ explains the type of functions you can perform using each section.</p> change password, change settings and refresh the application. <li><b>Gluster Menu:</b> Helps you to manage your cluster, servers, and volumes. -</ul> +For example, if you have selected volumes, the Gluster menu displays all volume related options.</ul> </body> </html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html index e1e7a798..94d26c03 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html @@ -17,7 +17,7 @@ type="text/css" media="screen" /> <p><b>Note:</b> <FONT FACE = "Courier">glustermg.repo</FONT> has been created and tested with CentOS 5.6. It may work with other versions of CentOS, however it has not been extensively tested.
<li>Save the file in the following location on your machine:
<p><FONT FACE = "Courier">/etc/yum.repos.d/</FONT>
-<li>5. Run the following command to install Gluster Management Gateway:
+<li> Run the following command to install Gluster Management Gateway:
<p><FONT FACE = "Courier"># yum groupinstall glustermg</FONT>
<li>The following packages are installed if not installed earlier:
<ul>
@@ -30,11 +30,20 @@ type="text/css" media="screen" /> </ol>
<p>Gateway generates SSH keys during installation. These keys are stored in the following location <FONT FACE = "Courier">/opt/glustermg/keys</FONT>. These keys are used for communication with the storage servers. However, in Amazon Web Services (AWS) environment, SSH communication is done using the private key provided by Amazon. Hence, the AWS genegrated private key (.pem file) must be stored in <FONT FACE = "Courier">/opt/glustermg/keys</FONT> and the file must be named as <FONT FACE = "Courier">gluster.pem</FONT></p>
<p><b>Note:</b>
-<ol>
+<ul>
<li>You can install the Gluster Management Gateway packages on a Gluster Storage Server. However, this can impact performance of the GlusterFS processes on this machine hence this is not recommended.
-<li>The Gluster Management Gateway is shipped with a self-signed SSL certificate, by default. While this ensures that the communication between the console and gateway is encrypted and safe, some browsers may throw security warnings mentioning that the site is not secure. It is highly recommended that you install your own SSL certificate issued by a valid certifying authority in the tomcat5 configuration for the 8443 port.
-<li>Enable port 8443 on the Gateway as the Management Console connects to it over SSL on this port.
-<li> Gluster Management Gateway communicates with all storage servers through SSH, using their host names. Make sure all of your storage server's host names (fully qualified domain names) are resolvable by the Gateway and by each other. If you have a properly configured DNS setup, this should work seamlessly.
-</ol>
+
+ <li>The Gluster Management Gateway is shipped with a self-signed
+ SSL certificate, by default. While this ensures that the communication
+ between the console and gateway is encrypted and safe, some browsers
+ may throw security warnings mentioning that the site is not secure. It
+ is highly recommended that you install your own SSL certificate issued
+ by a valid certifying authority in the tomcat5 configuration for the
+ 8443 port. For more information on obtaining your own service
+ certificate, refer to <a href="http://tomcat.apache.org/tomcat-5.5-doc/ssl-howto.html#Installing_a_Certificate_from_a_Certificate_Authority" target="_blank">Installing a Certificate from a
+ Certificate Authority</a> from Tomcat documentation.
+ <li>Ensure to enable port 8443 (HTTPS), port 24731 (TCP), and port 24729 (UDP) on the gateway.
+<li>Gluster Management Gateway communicates with all storage servers through SSH, using their host names. Make sure all of your storage server's host names (fully qualified domain names) are resolvable by the Gateway and by each other. If you have a properly configured DNS setup, this should work seamlessly.
+</ul>
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html index db8c48b3..af04461f 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html @@ -13,12 +13,12 @@ type="text/css" media="screen" /> Gluster Management Gateway communicates with every node of your cluster using the backend package. This package must be installed on each and every node of your cluster using the Linux package published by Gluster.
<p><b>Pre-requisite</b></p>
<ul>
-<li>Ensure that you have installed GlusterFS v3.2.3 or higher on all the nodes of your cluster.
+<li> Your backend machines can be either Gluster Storage Software Appliance, Gluster Virtual Storage Appliance, or CentOS 5.6 running GlusterFS v3.2.3 or higher.
</ul>
<p>To install the backend packages on each and every node of your cluster, perform the following steps:</p>
<ol>
-<li>Download Gluster Management Gateway repository configuration file (<FONT FACE = "Courier">glustermg.repo</FONT>) and the Gluster Management Gateway RPM (<FONT FACE = "Courier">glustermg-1.0.0-1.x86_64.rpm</FONT>) from the location provided by Gluster. :
+<li>Download Gluster Management Gateway repository configuration file (<FONT FACE = "Courier">glustermg.repo</FONT>) and the Gluster Management Gateway Backend RPM (<FONT FACE = "Courier">glustermg-backend-1.0.0-1.x86_64.rpm</FONT>) from the location provided by Gluster. :
<p><b>Note:</b> <FONT FACE = "Courier">glustermg.repo</FONT> has been created and tested with CentOS 5.6. It may work with other versions of CentOS, however it has not been extensively tested.
<li>Save the file in the following location on your machine:
<p><FONT FACE = "Courier">/etc/yum.repos.d/</FONT>
@@ -37,6 +37,10 @@ Gluster Management Gateway communicates with every node of your cluster using th <li>libxml2 v2.6
</ul>
</ol>
-<p><b>Note:</b> In case CIFS only, the Samba services must be configured to run on port 445 which needs to be enabled and open on all the storage servers in your cluster.</p>
+<p><b>Note:</b>
+<ul>
+<li>You must enable port 24729 (UDP) for auto discovery of servers.
+<li>In case CIFS only, the Samba services must be configured to run on port 445 which needs to be enabled and open on all the storage servers in your cluster.
+</ul>
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html index 50d3cb4d..17b7f0a8 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html @@ -15,16 +15,16 @@ in many respects forming a single computer. Gluster Management Console enables you to create, register and select cluster.
<h2>Cluster Summary</h2>
<p>The console enables you to monitor your cluster resources from
-the Summary tab. To display the summary of your cluster, click the
+the <b>Summary</b> tab. To display the summary of your cluster, click the
cluster node from the left pane of the console window. The summary of
the selected cluster is displayed in the right pane of the console
window.
-<p><img src="../images/GMC_Cluster_Summary_tab.jpg" alt="Cluster Summary" />
+<p><img src="../images/GMC_Cluster_Summary_tab_new.jpg" alt="Cluster Summary" />
<p>After you log into the application successfully, you will be prompted to:
<ul>
-<li>Select cluster: The cluster you will manage in the login session.
-<li>Create cluster: Creating an empty cluster that can be expanded using the console.
-<li>Register cluster: Registering an existing cluster and start managing it through the console.
+<li><a href="select_cluster.html">Selecting a Cluster</a>: The cluster you will manage in the login session.
+<li><a href="create_cluster.html">Creating a Cluster</a>: Creating an empty cluster that can be expanded using the console.
+<li><a href="register_cluster.html">Registering a Cluster</a>: Registering an existing cluster and start managing it through the console.
</ul>
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html index 2b372d0f..a37ed7b4 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html @@ -28,7 +28,7 @@ manage the volumes stored on file server machines. <p>The console also enables you to monitor the volumes in your cluster from the <b>Summary</b> tab. To display the summary of your volumes,
click the Volume node from the left pane of the console window. The summary of the volumes is displayed in the right pane of the console
window. It also displays <B>Tasks</B> and <B>Alerts</B> of all the volumes.
-<p><img src="../images/GMC_Volume_Summary_tab.jpg" alt="Volume Summary" />
+<p><img src="../images/GMC_Volume_Summary.jpg" alt="Volume Summary" />
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html index e5f708a9..5673586e 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html @@ -13,9 +13,9 @@ type="text/css" media="screen" /> Thresholds are the critical conditions that you define in Gluster Management Console.
<p>To set the thresholds, perform the following steps:</p>
<ol>
-<li>Choose <b>Edit</b> > <b>Settings</b>
-<p><b>Preferences</b> window is displayed.</p>
-<li>Choose <b>Gluster</b> > <b>Alerts</b> page from the right pane of the <b>Preferences</b> window.
+<li>Choose <b>Edit</b> > <b>Settings</b> > <b>Alerts</b>
+<p>The Preferences window displays the <b>Alerts</b> page on the right pane of the window.</p>
+
<p><img src="../images/GMC_Alerts.jpg" alt="Alerts Perferences" /></p>
<li>Type the value for server CPU threshold limits in the <b>Server CPU Threshold</b> field.
<li>Type the value for server memory usage threshold in the <b>Server Memory Usage Threshold</b> field.
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html index bc1199b0..e85d9324 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html @@ -11,12 +11,11 @@ type="text/css" media="screen" /> <body>
<h1>Setting the Charts Preferences</h1>
You can customize the console and change the way some of the monitoring data is displayed, as described in this section.
-<p><b>Note:</b> The default duration for all the charts is a week.</p>
+<p><b>Note:</b> The default duration for all the charts is a day.</p>
<p>To set the display of the charts, perform the following:</p>
<ol>
-<li>Choose <b>Edit</b> > <b>Settings</b>
-<p>The <b>Preferences</b> window is displayed. </p>
-<li>Choose <b>Gluster</b> > <b>Charts</b> page from the right pane of the <b>Preferences</b> window.
+<li>Choose <b>Edit</b> > <b>Settings</b> > <b>Charts</b>
+<p>The Preferences window displays the <b>Charts</b> page on the right pane of the window.</p>
<p><img src="../images/GMC_Charts.jpg" alt="Charts Perferences"/></p>
<li>Select the <b>Aggregated CPU Usage chart period</b> from the drop down list.
<li>Select the <b>Aggregated Network Usage chart period</b> from the drop down list.
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html index 74cb4ba4..16db7708 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html @@ -13,15 +13,12 @@ type="text/css" media="screen" /> Please enter your text here.
<p>To set the Gluster perferences, perform the following steps:
<ol>
-<li>Choose <b>Edit</b> > <b>Settings</b>
-<p>The <b>Preferences</b> window is displayed.
-<li>Choose <b>Gluster</b> page from the right pane of the <b>Preferences</b> window.
-
-
+<li>Choose <b>Edit</b> > <b>Settings</b> > <b>Gluster</b>
+<p>The Preferences window displays the <b>Gluster</b> page on the right pane of the window.</p>
<p><img src="../images/GMC_Preferences_gluster.jpg" alt="Gluster Perferences" /></p>
<li>Select <b>Show Cluster Selection Dialog on Login</b>, if you want your cluster name to appear when you launch the application.
<li>Choose your cluster name from <b>Default Cluster to Manage</b> drop down list to manage the default cluster you wish to manage when you launch the application.</li>
-<li>Type the duration of the data synchronization intervals in the <b>Data Sync Interval</b> field.
+<li>Type the duration (in sec) of the refresh intervals in the <b>Refresh Interval</b> field.
<li>Click <b>Apply</b>.
<li>Click <b>OK</b> to exit the <b>Preferences</b> window.
</body>
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html index 254fb15d..13f9f54c 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html @@ -11,7 +11,7 @@ type="text/css" media="screen" /> <body>
<h1>Preferences</h1>
-You can use preferences to configure several aspects of the Gluster Management Console. These include setting preferences for the console, alerts, and charts.
+You can use preferences to configure several aspects of the Gluster Management Console. These include setting preferences for the console, alerts, charts, and terminal.
<ul>
<li><a href="setting_gluster_prefs.html">Setting Gluster Preferences</a>
<li><a href="setting_alerts_prefs.html">Setting Alert Preferences</a>
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html index e48535be..8f381665 100644 --- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html @@ -13,10 +13,8 @@ type="text/css" media="screen" /> <p>You can customize the terminal window as described in this section.</p>
<p>To set the display of the charts, perform the following:</p>
<ol>
-<li>Choose <b>Edit</b> > <b>Settings</b>
-<p><b>Preferences</b> window is displayed.</p>
-<li>Choose <b>Terminal</b> from the right pane of the <b>Preferences</b> window.
-<p>The <b>Preferences</b> window displays the <b>Terminal</b> page on the left pane of the window.
+<li>Choose <b>Edit</b> > <b>Settings</b> > <b>Terminal</b>
+<p>The Preferences window displays the <b>Terminal</b> page on the right pane of the window.</p>
<p><img src="../images/GMC_Preferences_terminal.jpg" alt="Gluster Perferences" /></p>
<li>Type the limit of terminal buffer lines in the <b>Terminal buffer lines</b> field.
<li>Type the value of the serial timeout in the <b>Serial timeout</b> field.</li>
diff --git a/src/com.gluster.storage.management.console.help/html/help_home.html b/src/com.gluster.storage.management.console.help/html/help_home.html index 494f7171..b9c17b9e 100644 --- a/src/com.gluster.storage.management.console.help/html/help_home.html +++ b/src/com.gluster.storage.management.console.help/html/help_home.html @@ -21,7 +21,7 @@ manage logs, download server configurations, and more.</p> <p>For information about how to install Gluster Filesystem, refer to the <a href="http://www.gluster.com/community/documentation/index.php/Gluster_3.2_Filesystem_Installation_Guide" target="_blank">Gluster -3.2 Filesystem Installation Guide</a> . For information about accessing the +3.2 Filesystem Installation Guide</a>. For information about accessing the cluster using client systems, <a href="http://www.gluster.com/community/documentation/index.php/Gluster_3.2:_Accessing_Data_-_Setting_Up_GlusterFS_Client" target="_blank">Gluster 3.2: Accessing Data - Setting Up GlusterFS Client</a>.</p> diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg Binary files differindex 4dc5f8ea..4e39d5f4 100644 --- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg +++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg Binary files differindex 4d98a03e..7b273913 100644 --- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg +++ b/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg Binary files differnew file mode 100644 index 00000000..53e83ce6 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg Binary files differindex 8b263313..6a21e8b9 100644 --- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg +++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg Binary files differindex 06702e7b..b1348c59 100644 --- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg +++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg Binary files differindex bc1c8049..1da58638 100644 --- a/src/com.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg +++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg Binary files differindex 96eb090b..1198e0bf 100644 --- a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg +++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg b/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg Binary files differindex 88a1db3d..23287308 100644 --- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg +++ b/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg diff --git a/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html b/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html index bc62ef9b..79c42427 100644 --- a/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html +++ b/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html @@ -18,7 +18,7 @@ To start Gluster Management Console using Java web start, perform the following <li>Your web browser has cookies and Javascript enabled.
</ul>
<li>Type the following URL in your web browser:
-<p><FONT FACE = "Courier">http://server-name:webserver-port/glustermg/gluster-management-console.jnlp</FONT>
+<p><FONT FACE = "Courier">https://server-name:webserver-port/glustermg/</FONT>
<p>Gluster Management Console login window is displayed.</p>
<img src="../images/GMC_Login_Window.jpg" alt="Gluster Management Console"/>
<li>Type the following default user name and password in the login window:
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html b/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html index aaefc783..43d51231 100644 --- a/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html +++ b/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html @@ -13,21 +13,21 @@ type="text/css" media="screen" /> You can delete a volume or multiple volumes from your storage environment, as required.
<p>To delete a volume, perform the following steps.</p>
<ol>
- <li>Choose from the menu, toolbar, or right click and select the Volume and select <b>Delete Volume</b>.
- <p>The <b>Delete Volume</b> window appears. You are asked to confirm before proceeding with the
+<li>Choose from the menu, toolbar, or right click and select the Volume and select <b>Delete Volume</b>.
+<p>The <b>Delete Volume</b> window appears. You are asked to confirm before proceeding with the
volume deletion
- <p><img src="../images/GMC_Delete_Vol.jpg" alt="Delete Volume" /></p>
- <p>In case of multiple volumes, the Delete Volume window is displayed as shown below.</p>
- <p><img src="../images/GMC_Delete_Vol_multiple.jpg" alt="Delete Multiple Volumes" /></p>
- <li>If you wish to delete the volume permanently, click <b>Delete Volume and Data</b>.
- <li>If you wish to keep the data but delete the volume, click <b>Delete Volume, Keep Data</b>.
- <p>The bricks directories of the volume will be renamed to <FONT FACE = "Courier"><olddirectory>_<timestamp></FONT>.
- <p>The <b>Delete Volume</b> window is displayed indicating that the volume
- was deleted successfully.</p>
- <p><img src="../images/GMC_Delete_Vol_success.jpg" alt="Delete Volume" /></p>
- <p>In case of multiple volumes, the <b>Delete Volume</b> window is displayed as follows.</p>
- <p><img src="../images/GMC_Delete_Vol_multiple_success.jpg" alt="Delete Multiple Volumes" /></p>
- <li>Click <b>OK</b>.
+<p><img src="../images/GMC_Delete_Vol.jpg" alt="Delete Volume" /></p>
+<p>In case of multiple volumes, the Delete Volume window is displayed as shown below.</p>
+<p><img src="../images/GMC_Delete_Vol_multiple.jpg" alt="Delete Multiple Volumes" /></p>
+<li>If you wish to delete the volume permanently, click <b>Delete Volume and Data</b>.
+<li>If you wish to keep the data but delete the volume, click <b>Delete Volume, Keep Data</b>.
+<p>The brick(s) directories of the volume will be renamed to <FONT FACE = "Courier"><olddirectory>_<timestamp></FONT>.
+<li>The <b>Delete Volume</b> window is displayed indicating that the volume
+ was deleted successfully.
+<p><img src="../images/GMC_Delete_Vol_success.jpg" alt="Delete Volume" /></p>
+<p>In case of multiple volumes, the <b>Delete Volume</b> window is displayed as follows.</p>
+<p><img src="../images/GMC_Delete_Vol_multiple_success.jpg" alt="Delete Multiple Volumes" /></p>
+<li>Click <b>OK</b>.
</ol>
</body>
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html b/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html index eac9f4a8..ef1c66bd 100644 --- a/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html +++ b/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html @@ -17,7 +17,7 @@ To register a cluster, perform the following steps. <p><img src="../images/GMC_Register_Cluster.jpg" alt="Register Cluster" />
<li>Select <b>Register</b>. Type the name of the cluster and server name in the respective fields.
<p>Note: Ensure that you type an online server name in the <b>Server Name</b> field.</p>
- <li>Click <b>OK</b>. The Gluster Management Console will register the cluster with the gateway, fetch all the management information such as servers and volume resources and display them in the console.
+ <li>Click <b>OK</b>. The Gluster Management Console will register the cluster with the gateway; fetch all the management information such as servers, volume resources and display them in the console.
</ol>
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/tasks/remove_brick.html b/src/com.gluster.storage.management.console.help/html/tasks/remove_brick.html index a05c83ec..fbbfb89e 100644 --- a/src/com.gluster.storage.management.console.help/html/tasks/remove_brick.html +++ b/src/com.gluster.storage.management.console.help/html/tasks/remove_brick.html @@ -13,10 +13,7 @@ type="text/css" media="screen" /> You can shrink volumes, as needed, while the cluster is online and
available. For example, you might need to remove a brick that has become
inaccessible in a distributed volume due to hardware or network failure.
-<p><b>Note:</b> Data residing on the brick that you are removing
-will no longer be accessible; only the configuration information is
-removed - you can continue to access the data directly from the brick,
-as necessary.
+
<p>To remove bricks from an existing volume, perform the following
steps.</p>
<ol>
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html b/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html index 1dbd96a4..a3dc9466 100644 --- a/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html +++ b/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html @@ -20,7 +20,7 @@ To select a cluster, perform the following steps. Name</b> drop down list.
<li>Click <b>OK</b>.The <b>Progress Information</b> window is displayed is displayed while the console fetches the management information for the selected cluster.
<p><img src="../images/GMC_Select_Cluster_progess.jpg" alt="Select Cluster Progress Information" />
- <li>The Gluster Management Console window displays the selected cluster.
+ <li>The <b>Gluster Management Console</b> window displays the selected cluster.
</ol>
</body>
</html>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html b/src/com.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html index 9a48b86e..b9dc0e72 100644 --- a/src/com.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html +++ b/src/com.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html @@ -15,9 +15,8 @@ type="text/css" media="screen" /> <li>Select the volume for which you need to tune volume options.
<li>Click the <b>Volume Options</b> tab.
<p><img src="../images/GMC_Volume_Options.jpg" alt="Volume Options"/></p>
- <li>Click <b>Add</b>. Choose the volume option from <b>Option Key</b> drop down list
- and type the value in the <b>Option Value</b> field.
- <p>You can edit the value of an existing option by selecting the <b>Option Value</b> field</p>
+ <li>Click <b>Add</b>. Choose the volume option from <b>Option Key</b> drop down list and type the value in the <b>Option Value</b> field.
+ <p>You can edit the value of an existing option by selecting the <b>Option Value</b> field.</p>
</ol>
<p>To read more about the volume options, refer to the <A HREF="http://www.gluster.com/community/documentation/index.php/Gluster_3.2:_Tuning_Volume_Options" TARGET="_blank">Gluster
Filesystem Administration Guide, Section 8.1 Tuning Volume Options</A>.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java index df24f15b..752954e8 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java @@ -41,37 +41,23 @@ public class DownloadVolumeLogsAction extends AbstractActionDelegate { @Override protected void performAction(IAction action) { final VolumesClient client = new VolumesClient(); - final Runnable downloadLogsThread = new Runnable() { - - @Override - public void run() { - Volume volume = guiHelper.getSelectedEntity(getWindow(), Volume.class); - - FileDialog dialog = new FileDialog(getShell(), SWT.SAVE); - dialog.setFilterNames(new String[] {"GZipped Tar (*.tar.gz)"}); - dialog.setFilterExtensions(new String[] {"*.tar.gz"}); - String filePath = dialog.open(); - - if(filePath == null) { - return; - } - - String title = "Download Volume Logs [" + volume.getName() + "]"; - try { - client.downloadLogs(volume.getName(), filePath); - showInfoDialog(title, "Volume logs downloaded successfully to [" + filePath + "]"); - } catch(Exception e) { - showErrorDialog(title, e.getMessage()); - } - } - }; - - BusyIndicator.showWhile(Display.getDefault(), new Runnable() { - - @Override - public void run() { - Display.getDefault().asyncExec(downloadLogsThread); - } - }); + Volume volume = guiHelper.getSelectedEntity(getWindow(), Volume.class); + + FileDialog dialog = new FileDialog(getShell(), SWT.SAVE); + dialog.setFilterNames(new String[] { "GZipped Tar (*.tar.gz)" }); + dialog.setFilterExtensions(new String[] { "*.tar.gz" }); + String filePath = dialog.open(); + + if (filePath == null) { + return; + } + + String title = "Download Volume Logs [" + volume.getName() + "]"; + try { + client.downloadLogs(volume.getName(), filePath); + showInfoDialog(title, "Volume logs downloaded successfully to [" + filePath + "]"); + } catch (Exception e) { + showErrorDialog(title, e.getMessage()); + } } } diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java index 2f0d03dc..ac61709d 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java @@ -37,36 +37,22 @@ public class ExportSshKeysAction extends AbstractActionDelegate { @Override protected void performAction(IAction action) { final KeysClient client = new KeysClient(); - final Runnable exportKeysThread = new Runnable() { - - @Override - public void run() { - FileDialog dialog = new FileDialog(getShell(), SWT.SAVE); - dialog.setFilterNames(new String[] {"Tar (*.tar)"}); - dialog.setFilterExtensions(new String[] {"*.tar"}); - String filePath = dialog.open(); - - if(filePath == null) { - return; - } - - String title = "Export SSH Keys"; - try { - client.exportSshKeys(filePath); - showInfoDialog(title, "SSH keys exported successfully to [" + filePath + "]"); - } catch(Exception e) { - showErrorDialog(title, e.getMessage()); - } - } - }; - - BusyIndicator.showWhile(Display.getDefault(), new Runnable() { - - @Override - public void run() { - Display.getDefault().asyncExec(exportKeysThread); - } - }); + FileDialog dialog = new FileDialog(getShell(), SWT.SAVE); + dialog.setFilterNames(new String[] { "Tar (*.tar)" }); + dialog.setFilterExtensions(new String[] { "*.tar" }); + String filePath = dialog.open(); + + if (filePath == null) { + return; + } + + String title = "Export SSH Keys"; + try { + client.exportSshKeys(filePath); + showInfoDialog(title, "SSH keys exported successfully to [" + filePath + "]"); + } catch (Exception e) { + showErrorDialog(title, e.getMessage()); + } } diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py index 2c47d396..ff994731 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py @@ -1,19 +1,6 @@ -# Copyright (c) 2009 Gluster, Inc. <http://www.gluster.com> +# Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of GlusterSP. # -# GlusterSP is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 3 of the License, -# or (at your option) any later version. -# -# GlusterSP is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import dbus diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/GlusterdUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/GlusterdUtils.py index 7c0e899c..9295d83b 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/GlusterdUtils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/GlusterdUtils.py @@ -1,19 +1,6 @@ -# Copyright (c) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import Utils diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py index 9f5687e4..2c3f38e0 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py @@ -1,19 +1,6 @@ -# Copyright (c) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import sys diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/RRDUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/RRDUtils.py index 1ad0deee..d1a6c058 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/RRDUtils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/RRDUtils.py @@ -1,3 +1,7 @@ +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> +# This file is part of Gluster Storage Platform. +# + import rrdtool import os from socket import gethostname diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/ServerUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/ServerUtils.py index 1fec994c..16cdeed2 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/ServerUtils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/ServerUtils.py @@ -1,19 +1,6 @@ -# Copyright (c) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import re diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py index b1031ccc..020a1900 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py @@ -1,19 +1,6 @@ -# Copyright (c) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import glob diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py index e41baa0e..c3ee2146 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py @@ -1,20 +1,7 @@ #!/usr/bin/python -# Copyright (C) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import sys diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_disk_name_by_path.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_disk_name_by_path.py index 08e80b7e..e9955e21 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_disk_name_by_path.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_disk_name_by_path.py @@ -1,20 +1,7 @@ #!/usr/bin/python -# Copyright (C) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import Utils diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_file.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_file.py index 61c33eba..265823ab 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_file.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_file.py @@ -1,19 +1,6 @@ -# Copyright (C) 2009,2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import Globals import Utils diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py index 39bfe01c..3bc63db0 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py @@ -1,20 +1,7 @@ #!/usr/bin/python -# Copyright (C) 2009,2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import sys diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py index e7dec088..ccd5815b 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py @@ -1,20 +1,7 @@ #!/usr/bin/python -# Copyright (C) 2009 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import sys diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py index ff4a4b9a..fffbc3ba 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py @@ -1,20 +1,7 @@ #!/usr/bin/python -# Copyright (C) 2009,2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import re import os diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_log.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_log.py index f388aa4e..c4c97a51 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_log.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_log.py @@ -1,19 +1,7 @@ -# Copyright (C) 2009,2010 Gluster, Inc. <http://www.gluster.com> +#!/usr/bin/python +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import sys diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_provision_block_wrapper.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_provision_block_wrapper.py index 849bce3f..e7aeeb5f 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_provision_block_wrapper.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_provision_block_wrapper.py @@ -1,20 +1,7 @@ #!/usr/bin/python -# Copyright (C) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import sys diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_update_cpu_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_update_cpu_details.py index 6ec6a1e3..9f93b84b 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_update_cpu_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_update_cpu_details.py @@ -1,20 +1,8 @@ #!/usr/bin/python -# Copyright (C) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. + import os import sys p1 = os.path.abspath(os.path.dirname(sys.argv[0])) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_update_memory_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_update_memory_details.py index 0a30d248..2639d490 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_update_memory_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_update_memory_details.py @@ -1,20 +1,8 @@ #!/usr/bin/python -# Copyright (C) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. + import os import sys p1 = os.path.abspath(os.path.dirname(sys.argv[0])) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py index cfab83b6..ea37fa92 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py @@ -1,19 +1,6 @@ -# Copyright (C) 2010 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. MULTICAST_GROUP = '224.224.1.1' MULTICAST_PORT = 24729 diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Protocol.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Protocol.py index ff073593..a11164f7 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/common/Protocol.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Protocol.py @@ -1,19 +1,6 @@ -# Copyright (C) 2009 Gluster, Inc. <http://www.gluster.com> +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> # This file is part of Gluster Storage Platform. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import xml import xml.parsers.expat diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py index 0b06b5ab..03e7eb58 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py @@ -1,19 +1,6 @@ -# Copyright (c) 2010 Gluster, Inc. <http://www.gluster.com> -# This file is part of Gluster Storage Platform. +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> +# This file is part of Gluster Management Gateway. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import os import sys diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py b/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py index b9db15c8..beff388b 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py @@ -1,19 +1,6 @@ -# Copyright (C) 2009 Gluster, Inc. <http://www.gluster.com> -# This file is part of Gluster Storage Platform. +# Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com> +# This file is part of Gluster Management Gateway. # -# Gluster Storage Platform is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# Gluster Storage Platform is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. import xml import xml.parsers.expat diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java index 1a534d8c..8d788925 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java @@ -157,9 +157,8 @@ public class ServerSyncTask { // The server discovery mechanism will return every server that has not been "peer probed". However we // need to filter out those servers that are the "first" server of a new cluster, and hence are still // not peer probed. - String hostName = serverUtil.fetchHostName(serverName); - if(!existingServers.contains(hostName)) { - serverNameList.add(hostName); + if(!existingServers.contains(serverName)) { + serverNameList.add(serverName); } } } |
