From c2b4ed41ccf2e2a7958aee7cab521fdeeabbca38 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Thu, 21 Jul 2011 21:23:19 +0530 Subject: Added some new icons --- .../icons/tango/16x16/replace-brick.png | Bin 0 -> 844 bytes .../icons/tango/22x22/disk-initialisation.png | Bin 0 -> 1100 bytes .../icons/tango/22x22/high-memory-usage.png | Bin 0 -> 834 bytes .../icons/tango/22x22/low-diskspace.png | Bin 0 -> 1042 bytes .../icons/tango/22x22/offline-brick.png | Bin 0 -> 840 bytes .../icons/tango/22x22/offline-server.png | Bin 0 -> 1276 bytes .../icons/tango/22x22/replace-brick.png | Bin 0 -> 1213 bytes .../icons/tango/22x22/server-warning.png | Bin 0 -> 806 bytes .../icons/tango/22x22/volume-rebalance.png | Bin 0 -> 955 bytes .../icons/tango/32x32/add-server.png | Bin 0 -> 2137 bytes .../icons/tango/32x32/remove-volume.png | Bin 0 -> 1449 bytes .../icons/tango/32x32/remove-volume.svg | 1699 -------------------- .../icons/tango/48x48/add-server.svg | 126 ++ src/com.gluster.storage.management.gui/plugin.xml | 8 +- .../management/gui/DeviceTableLabelProvider.java | 2 +- .../management/gui/GlusterDataModelManager.java | 57 +- .../gluster/storage/management/gui/IImageKeys.java | 21 +- .../gui/ServerDiskTableLabelProvider.java | 2 +- .../gui/dialogs/ClusterSelectionDialog.java | 2 +- .../management/gui/dialogs/MigrateBrickPage1.java | 20 +- .../management/gui/views/ClusterSummaryView.java | 40 +- .../gui/views/GlusterServerSummaryView.java | 9 +- .../gui/views/GlusterServersSummaryView.java | 8 +- 23 files changed, 234 insertions(+), 1760 deletions(-) create mode 100644 src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png create mode 100644 src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png delete mode 100644 src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.svg create mode 100644 src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.svg (limited to 'src/com.gluster.storage.management.gui') diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png new file mode 100644 index 00000000..828ede1b Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png new file mode 100644 index 00000000..73ecf4c0 Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png new file mode 100644 index 00000000..b7c166ab Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png new file mode 100644 index 00000000..983012ad Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png new file mode 100644 index 00000000..e0528241 Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png new file mode 100644 index 00000000..5900c724 Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png new file mode 100644 index 00000000..48a66c8c Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png new file mode 100644 index 00000000..9e2da0bc Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png new file mode 100644 index 00000000..4539822c Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png b/src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png new file mode 100644 index 00000000..29a512f2 Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png b/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png new file mode 100644 index 00000000..68de86a3 Binary files /dev/null and b/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png differ diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.svg b/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.svg deleted file mode 100644 index 0a0a6cf5..00000000 --- a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.svg +++ /dev/null @@ -1,1699 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.svg b/src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.svg new file mode 100644 index 00000000..233ee823 --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2005-03-08 + + + Jakub Steiner + + + + + workstation + computer + node + client + + + + http://jimmac.musichall.cz/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml index db5605f3..f1ac0e73 100644 --- a/src/com.gluster.storage.management.gui/plugin.xml +++ b/src/com.gluster.storage.management.gui/plugin.xml @@ -406,7 +406,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.gui.actions.DeleteVolumeAction" definitionId="com.gluster.storage.management.gui.commands.DeleteVolume" - icon="icons/tango/32x32/remove-volume.svg" + icon="icons/tango/32x32/remove-volume.png" id="com.gluster.storage.management.gui.actions.DeleteVolumeAction" label="&Delete Volume(s)" menubarPath="com.gluster.storage.management.gui.actionsets.volumes/volumes" @@ -514,7 +514,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.gui.actions.DeleteVolumeAction" definitionId="com.gluster.storage.management.gui.commands.DeleteVolume" - icon="icons/tango/32x32/remove-volume.svg" + icon="icons/tango/32x32/remove-volume.png" id="com.gluster.storage.management.gui.actions.DeleteVolumeAction" label="&Delete Volume" menubarPath="com.gluster.storage.management.gui.menu.volume/volume" @@ -793,7 +793,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.gui.actions.AddServerAction" definitionId="com.gluster.storage.management.gui.commands.AddServer" - icon="icons/server-add.png" + icon="icons/tango/32x32/add-server.png" id="com.gluster.storage.management.gui.actions.AddServerAction" label="&Add Server(s)" menubarPath="com.gluster.storage.management.gui.menu.discoveredservers/discoveredservers" @@ -851,7 +851,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.gui.actions.AddServerAction" definitionId="com.gluster.storage.management.gui.commands.AddServer" - icon="icons/server-add.png" + icon="icons/tango/32x32/add-server.png" id="com.gluster.storage.management.gui.actions.AddServerAction" label="&Add Server(s)" menubarPath="com.gluster.storage.management.gui.menu.discoveredserver/discoveredserver" diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java index 62d67e43..d4000fab 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java @@ -83,7 +83,7 @@ public class DeviceTableLabelProvider extends LabelProvider implements ITableLab case UNINITIALIZED: return guiHelper.getImage(IImageKeys.DISK_UNINITIALIZED); case INITIALIZING: - return guiHelper.getImage(IImageKeys.DISK_INITIALIZING); + return guiHelper.getImage(IImageKeys.DISK_INITIALIZING_SMALL); default: throw new GlusterRuntimeException("Invalid disk status [" + status + "]"); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java index 54407fbd..07aa37da 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java @@ -396,7 +396,7 @@ public class GlusterDataModelManager { public void initializeTasks(Cluster cluster) { List taskInfoList = new TasksClient(cluster.getName()).getAllTasks(); - // List taskInfoList = getDummyTasks(); + //List taskInfoList = getDummyTasks(); cluster.setTaskInfoList(taskInfoList); } @@ -409,40 +409,65 @@ public class GlusterDataModelManager { taskInfo.setName("Migrate Brick-music"); taskInfo.setPauseSupported(true); taskInfo.setStopSupported(true); - taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); + taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_PAUSE, ""))); - taskInfo.getStatus().setMessage("Migrating file xxxxx to yyyy"); - taskInfo.setDescription("Migrate Brick on volume [music] from /export/adb/music to /export/sdc/music."); + taskInfo.getStatus().setMessage("Paused"); + taskInfo.setDescription("Migrate Brick on volume [Movies] from /export/adb/music to /export/sdc/music."); taskInfoList.add(taskInfo); + // Task #2 taskInfo = new TaskInfo(); taskInfo.setType(TASK_TYPE.DISK_FORMAT); - taskInfo.setName("Format Disk-server1:sdc"); + taskInfo.setName("Initialize disk [KVM-GVSA1:sdc]"); taskInfo.setPauseSupported(false); taskInfo.setStopSupported(false); - taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, ""))); - taskInfo.getStatus().setMessage("Format completes 80% ..."); - taskInfo.setDescription("Formatting disk server1:sdc."); + taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); + taskInfo.getStatus().setMessage("Format completed 80% ..."); + taskInfo.setDescription("Formatting disk [KVM-GVSA1:sdc]"); taskInfoList.add(taskInfo); + // Task #2 + taskInfo = new TaskInfo(); + taskInfo.setType(TASK_TYPE.VOLUME_REBALANCE); + taskInfo.setName("Rebalance volume [songs]"); + taskInfo.setPauseSupported(false); + taskInfo.setStopSupported(false); + taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); + taskInfo.getStatus().setMessage("Rebalance step1: layout fix in progress"); + taskInfo.setDescription("Rebalance volume [songs]"); + taskInfoList.add(taskInfo); + return taskInfoList; } - private List getDummyAlerts() { + private List getDummyAlerts(Cluster cluster) { List alerts = new ArrayList(); - for (Server server : model.getCluster().getServers()) { + for (Server server : cluster.getServers()) { if (alerts.size() == 0) { alerts.add(new Alert(ALERT_TYPES.CPU_USAGE_ALERT, server.getName(), - Alert.ALERT_TYPE_STR[ALERT_TYPES.CPU_USAGE_ALERT.ordinal()] + "[" + server.getCpuUsage() - + "] in " + server.getName())); + Alert.ALERT_TYPE_STR[ALERT_TYPES.CPU_USAGE_ALERT.ordinal()] + " [93.42 %] in " + + server.getName())); continue; } if (alerts.size() == 1) { - Double memoryUtilized = server.getMemoryInUse() / server.getTotalMemory() * 100d; alerts.add(new Alert(ALERT_TYPES.MEMORY_USAGE_ALERT, server.getName(), - Alert.ALERT_TYPE_STR[ALERT_TYPES.MEMORY_USAGE_ALERT.ordinal()] + "[" + memoryUtilized + "%] in " - + server.getName())); + Alert.ALERT_TYPE_STR[ALERT_TYPES.MEMORY_USAGE_ALERT.ordinal()] + " [91.83 %] in " + + server.getName())); + continue; + } + + if (alerts.size() == 2) { + alerts.add(new Alert(ALERT_TYPES.OFFLINE_SERVERS_ALERT, server.getName(), + Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_SERVERS_ALERT.ordinal()] + " " + server.getName())); + continue; + } + + if (alerts.size() == 3) { + alerts.add(new Alert(ALERT_TYPES.DISK_USAGE_ALERT, server.getName(), + Alert.ALERT_TYPE_STR[ALERT_TYPES.DISK_USAGE_ALERT.ordinal()] + " in " + server.getName() + ":" + "sdc")); + alerts.add(new Alert(ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT, "songs", + Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT.ordinal()] + " [KVM-GVSA4:/export/hdb4/songs] in volume [songs]")); continue; } } @@ -453,7 +478,7 @@ public class GlusterDataModelManager { AlertsManager alertsManager = new AlertsManager(cluster); alertsManager.buildAlerts(); cluster.setAlerts( alertsManager.getAlerts() ); - // cluster.addAlerts( getDummyAlerts() ); + //cluster.setAlerts( getDummyAlerts(cluster) ); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java index 49e2871b..1b895337 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java @@ -24,8 +24,8 @@ public interface IImageKeys { public static final String SERVERS = "icons/tango/16x16/servers.png"; public static final String VOLUME = "icons/tango/16x16/volume.png"; public static final String SERVER = "icons/tango/16x16/server.png"; - public static final String SERVER_WARNING = "icons/server-warning.png"; - public static final String MEMORY_USAGE_ALERT = "icons/tango/16x16/high-memory-usage.svg"; + public static final String SERVER_WARNING = "icons/tango/22x22/server-warning.png"; + public static final String MEMORY_USAGE_ALERT = "icons/tango/22x22/high-memory-usage.png"; public static final String GSN = "icons/gsn.png"; public static final String SETTINGS = "icons/settings.png"; public static final String ADD = "icons/plus-white.png"; @@ -35,12 +35,12 @@ public interface IImageKeys { public static final String STOP_VOLUME = "icons/tango/32x32/stop-volume.svg"; public static final String RESET_VOLUME_OPTIONS = "icons/tango/32x32/reset-volume-option.svg"; public static final String VOLUME_OPTIONS = "icons/tango/16x16/volume-options.png"; - public static final String SERVER_OFFLINE = "icons/tango/16x16/offline-server.png"; + public static final String SERVER_OFFLINE = "icons/tango/22x22/offline-server.png"; public static final String CREATE_VOLUME_BIG = "icons/tango/48x48/create-volume.svg"; - public static final String REMOVE_VOLUME = "icons/tango/32x32/remove-volume.svg"; - public static final String ADD_SERVER = "icons/server-add.png"; - public static final String ADD_SERVER_BIG = "icons/tango/48x48/server.png"; + public static final String REMOVE_VOLUME = "icons/tango/32x32/remove-volume.png"; + public static final String ADD_SERVER = "icons/tango/32x32/add-server.png"; + public static final String ADD_SERVER_BIG = "icons/tango/48x48/add-server.svg"; public static final String REMOVE_SERVER = "icons/server-remove.png"; public static final String HELP = "icons/question.png"; public static final String STATUS_OFFLINE = "icons/status-offline.png"; @@ -55,20 +55,23 @@ public interface IImageKeys { public static final String DISK_UNINITIALIZED = "icons/tango/16x16/disk-uninitialized.png"; public static final String IO_ERROR = "icons/tango/16x16/disk-error.png"; public static final String DISK_AVAILABLE = "icons/tango/16x16/disk-available.png"; - public static final String DISK_INITIALIZING = "icons/tango/16x16/disk-initialisation.png"; + public static final String DISK_INITIALIZING_SMALL = "icons/tango/16x16/disk-initialisation.png"; + public static final String DISK_INITIALIZING = "icons/tango/22x22/disk-initialisation.png"; public static final String DISK_IN_USE = "icons/tango/16x16/disk-inuse.png"; public static final String SEARCH = "icons/tango/22x22/system-search.png"; public static final String ARROW_UP = "icons/arrow-up.png"; public static final String ARROW_DOWN = "icons/arrow-down.png"; public static final String VOLUME_REBALANCE = "icons/tango/32x32/volume-rebalance.svg"; + public static final String VOLUME_REBALANCE_SMALL = "icons/tango/22x22/volume-rebalance.png"; public static final String BRICK_MIGRATE = "icons/tango/32x32/replace-brick.svg"; + public static final String BRICK_MIGRATE_SMALL = "icons/tango/22x22/replace-brick.png"; public static final String DOWNLOAD_LOG = "icons/tango/32x32/download-log.svg"; public static final String ADD_BRICK = "icons/tango/32x32/add-brick.svg"; public static final String REMOVE_BRICK = "icons/tango/32x32/remove-brick.svg"; - public static final String LOW_DISK_SPACE = "icons/tango/16x16/low-diskspace.svg"; + public static final String LOW_DISK_SPACE = "icons/tango/22x22/low-diskspace.png"; public static final String DISK_OFFLINE = "icons/status-offline.png"; - public static final String BRICK_OFFLINE = "icons/status-offline.png"; + public static final String BRICK_OFFLINE = "icons/tango/22x22/offline-brick.png"; public static final String bricks = "icons/tango/16x16/bricks.png"; diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java index a5b64e28..5da0353a 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java @@ -65,7 +65,7 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter { case UNINITIALIZED: return guiHelper.getImage(IImageKeys.DISK_UNINITIALIZED); case INITIALIZING: - return guiHelper.getImage(IImageKeys.DISK_INITIALIZING); + return guiHelper.getImage(IImageKeys.DISK_INITIALIZING_SMALL); default: throw new GlusterRuntimeException("Invalid disk status [" + status + "]"); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java index 82df0c46..37381172 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java @@ -159,7 +159,7 @@ public class ClusterSelectionDialog extends Dialog { @Override protected Control createDialogArea(Composite parent) { - parent.setBackgroundImage(guiHelper.getImage(IImageKeys.DIALOG_SPLASH_IMAGE)); + //parent.setBackgroundImage(guiHelper.getImage(IImageKeys.DIALOG_SPLASH_IMAGE)); // Makes sure that child composites inherit the same background parent.setBackgroundMode(SWT.INHERIT_FORCE); diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java index cb59c310..e4bb2692 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java @@ -76,16 +76,14 @@ public class MigrateBrickPage1 extends WizardPage { @Override public String getColumnText(Object element, int columnIndex) { - if (!(element instanceof Disk)) { + if (!(element instanceof Device)) { return null; } - Disk disk = (Disk) element; - return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName() - : columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint() + "/" + volumeName - : columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil - .formatNumber(disk.getFreeSpace() / 1024 ) /* Coverted to GB */ - : columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? NumberUtil - .formatNumber(disk.getSpace() / 1024) : "Invalid"); + Device device = (Device) element; + return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? device.getServerName() + : columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? device.getMountPoint() + "/" + volumeName + : columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil.formatNumber(device.getFreeSpace() / 1024 ) /* Coverted to GB */ + : columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? NumberUtil.formatNumber(device.getSpace() / 1024) : "Invalid"); } }; } @@ -207,18 +205,18 @@ public class MigrateBrickPage1 extends WizardPage { Text txtFilterFrom = guiHelper.createFilterText(container); Text txtFilterTo = guiHelper.createFilterText(container); - ITableLabelProvider diskLabelProvider = getDiskLabelProvider(volume.getName()); + ITableLabelProvider deviceLabelProvider = getDiskLabelProvider(volume.getName()); GlusterDataModelManager glusterDataModelManager = GlusterDataModelManager.getInstance(); List fromBricks = glusterDataModelManager.getReadyDevicesOfVolume(volume); List toDevices = glusterDataModelManager.getReadyDevicesOfAllServersExcluding( fromBricks ); - tableViewerFrom = createTableViewer(container, diskLabelProvider, fromBricks, txtFilterFrom); + tableViewerFrom = createTableViewer(container, deviceLabelProvider, fromBricks, txtFilterFrom); if(fromBrick != null) { setFromDisk(tableViewerFrom, fromBrick); } - tableViewerTo = createTableViewer(container, diskLabelProvider, toDevices, txtFilterTo); + tableViewerTo = createTableViewer(container, deviceLabelProvider, toDevices, txtFilterTo); // Auto commit selection field Composite autoCommitContainer = new Composite(container, SWT.NONE); diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java index 3f344d8b..a358066d 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java @@ -20,7 +20,6 @@ */ package com.gluster.storage.management.gui.views; -import java.util.ArrayList; import java.util.List; import org.eclipse.birt.chart.util.CDateTime; @@ -28,18 +27,19 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CLabel; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.events.HyperlinkAdapter; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.ImageHyperlink; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.part.ViewPart; -import com.gluster.storage.management.client.GlusterServersClient; import com.gluster.storage.management.core.model.Alert; import com.gluster.storage.management.core.model.Cluster; import com.gluster.storage.management.core.model.EntityGroup; @@ -47,8 +47,6 @@ import com.gluster.storage.management.core.model.GlusterDataModel; import com.gluster.storage.management.core.model.GlusterServer; import com.gluster.storage.management.core.model.GlusterServer.SERVER_STATUS; import com.gluster.storage.management.core.model.Server; -import com.gluster.storage.management.core.model.ServerStats; -import com.gluster.storage.management.core.model.ServerStatsRow; import com.gluster.storage.management.core.model.TaskInfo; import com.gluster.storage.management.core.utils.NumberUtil; import com.gluster.storage.management.gui.GlusterDataModelManager; @@ -68,6 +66,7 @@ public class ClusterSummaryView extends ViewPart { private ScrolledForm form; private Cluster cluster; private GlusterDataModel model = GlusterDataModelManager.getInstance().getModel(); + private static final int CHART_WIDTH = 350; /* * (non-Javadoc) @@ -133,11 +132,30 @@ public class ClusterSummaryView extends ViewPart { chartViewerComposite.setLayoutData(data); } + private Composite createChartLinks(Composite section, int columnCount) { + GridLayout layout = new org.eclipse.swt.layout.GridLayout(columnCount, false); + layout.marginBottom = 0; + layout.marginTop = 0; + layout.marginLeft = (CHART_WIDTH - (50*columnCount)) / 2; + Composite graphComposite = toolkit.createComposite(section, SWT.NONE); + graphComposite.setLayout(layout); + GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); + data.widthHint = CHART_WIDTH; + graphComposite.setLayoutData(data); + + Label label1 = toolkit.createLabel(graphComposite, "1 day"); + Hyperlink link1 = toolkit.createHyperlink(graphComposite, "1 week", SWT.NONE); + Hyperlink link2 = toolkit.createHyperlink(graphComposite, "1 month", SWT.NONE); + Hyperlink link3 = toolkit.createHyperlink(graphComposite, "1 year", SWT.NONE); + + return graphComposite; + } + private void createLineChart(Composite section, Calendar timestamps[], Double values[], String unit) { ChartViewerComposite chartViewerComposite = new ChartViewerComposite(section, SWT.NONE, timestamps, values, unit); GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); - data.widthHint = 400; - data.heightHint = 300; + data.widthHint = CHART_WIDTH; + data.heightHint = 250; data.verticalAlignment = SWT.CENTER; chartViewerComposite.setLayoutData(data); } @@ -254,10 +272,11 @@ public class ClusterSummaryView extends ViewPart { Double[] values = new Double[] { 10d, 11.23d, 17.92d, 18.69d, 78.62d, 89.11d, 92.43d, 89.31d, 57.39d, 18.46d, 10.44d, 16.28d, 13.51d, 17.53d, 12.21, 20d, 21.43d, 16.45d, 14.86d, 15.27d }; createLineChart(section, timestamps, values, "%"); + createChartLinks(section, 4); } private void createNetworkUsageSection() { - Composite section = guiHelper.createSection(form, toolkit, "Network Usage", null, 1, false); + Composite section = guiHelper.createSection(form, toolkit, "Network Usage (Aggregated)", null, 1, false); //toolkit.createLabel(section, "Historical Network Usage graph will be displayed here."); Calendar[] timestamps = new Calendar[] { new CDateTime(1000l*1310468100), new CDateTime(1000l*1310468400), new CDateTime(1000l*1310468700), @@ -274,6 +293,7 @@ public class ClusterSummaryView extends ViewPart { // new Date(1310473800) }; Double[] values = new Double[] { 32d, 31.23d, 27.92d, 48.69d, 58.62d, 49.11d, 72.43d, 69.31d, 87.39d, 78.46d, 60.44d, 56.28d, 33.51d, 27.53d, 12.21, 10d, 21.43d, 36.45d, 34.86d, 35.27d }; createLineChart(section, timestamps, values, "KiB/s"); + createChartLinks(section, 4); } private void createRunningTasksSection() { @@ -292,13 +312,13 @@ public class ClusterSummaryView extends ViewPart { Image taskImage = null; switch(taskInfo.getType()) { case DISK_FORMAT: - taskImage = guiHelper.getImage(IImageKeys.DISK); + taskImage = guiHelper.getImage(IImageKeys.DISK_INITIALIZING); break; case BRICK_MIGRATE: - taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE); + taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE_SMALL); break; case VOLUME_REBALANCE: - taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE); + taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE_SMALL); break; } lblAlert.setImage(taskImage); diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java index bae6b9e3..fbf787e3 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java @@ -113,7 +113,7 @@ public class GlusterServerSummaryView extends ViewPart { private void createLineChart(Composite section, Calendar timestamps[], Double values[], String unit) { ChartViewerComposite chartViewerComposite = new ChartViewerComposite(section, SWT.NONE, timestamps, values, unit); GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); -// data.widthHint = CHART_WIDTH; + data.widthHint = CHART_WIDTH; data.heightHint = 250; // data.verticalAlignment = SWT.CENTER; // data.grabExcessVerticalSpace = false; @@ -134,7 +134,7 @@ public class GlusterServerSummaryView extends ViewPart { //Double[] values = new Double[] { 10d, 11.23d, 17.92d, 18.69d, 78.62d, 89.11d, 92.43d, 20.31d, 19.63d, 18.46d, 10.44d, 16.28d, 13.51d, 17.53d, 12.21, 20d, 40d, 10d, 90d, 40d }; Double[] values = new Double[] { 35d, 34.23d, 37.92d, 28.69d, 38.62d, 39.11d, 38.46d, 30.44d, 36.28d, 72.43d, 79.31d, 77.39d, 33.51d, 37.53d, 32.21, 30d, 31.43d, 36.45d, 34.86d, 35.27d }; createLineChart(section, timestamps, values, "%"); - Composite graphComposite = createChartLinks(section, 4); + createChartLinks(section, 4); } private void createNetworkUsageSection() { @@ -151,9 +151,10 @@ public class GlusterServerSummaryView extends ViewPart { createLineChart(section, timestamps, values, "Kib/s"); Composite graphComposite = createChartLinks(section, 5); + CCombo interfaceCombo = new CCombo(graphComposite, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER | SWT.FLAT); interfaceCombo.setItems(new String[] {"eth0"}); - interfaceCombo.select(0); + interfaceCombo.select(0); } @@ -181,7 +182,7 @@ public class GlusterServerSummaryView extends ViewPart { // } // // createLineChart(section, timestamps.toArray(new Calendar[0]), data.toArray(new Double[0])); - Composite graphComposite = createChartLinks(section, 4); + createChartLinks(section, 4); } private Composite createChartLinks(Composite section, int columnCount) { diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java index b064d997..197b925f 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java @@ -154,7 +154,7 @@ public class GlusterServersSummaryView extends ViewPart { Composite section = guiHelper.createSection(form, toolkit, "Running Tasks", null, 1, false); for (TaskInfo taskInfo : GlusterDataModelManager.getInstance().getModel().getCluster().getTaskInfoList()) { - if (taskInfo.getType() != TASK_TYPE.VOLUME_REBALANCE) { // Exclude volume related tasks + if (taskInfo.getType() != TASK_TYPE.VOLUME_REBALANCE && taskInfo.getType() != TASK_TYPE.BRICK_MIGRATE) { // Exclude volume related tasks addTaskLabel(section, taskInfo); } } @@ -167,13 +167,13 @@ public class GlusterServersSummaryView extends ViewPart { Image taskImage = null; switch(taskInfo.getType()) { case DISK_FORMAT: - taskImage = guiHelper.getImage(IImageKeys.DISK); + taskImage = guiHelper.getImage(IImageKeys.DISK_INITIALIZING); break; case BRICK_MIGRATE: - taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE); + taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE_SMALL); break; case VOLUME_REBALANCE: - taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE); + taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE_SMALL); break; } lblAlert.setImage(taskImage); -- cgit