stick to go1.13 for now, update credits (#163)

fix release tags for mcs

.dockerignore

@@ -3,3 +3,4 @@ dist/
 target/
 mcs
 !mcs/
+portal-ui/node_modules/

.github/workflows/go.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.14.x]
+        go-version: [1.13.x, 1.14.x]
         os: [ubuntu-latest]
     steps:
       - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}

.github/workflows/release.yml

@@ -1,48 +0,0 @@
-name: goreleaser
-
-on:
-  pull_request:
-  push:
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Unshallow
-        run: git fetch --prune --unshallow
-      -
-        name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.14.x
-      -
-        name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@53acad1befee355d46f71cccf6ab4d885eb4f77f
-        with:
-          version: latest
-          args: release --skip-publish --rm-dist --snapshot
-      -
-        name: Upload Win64 Binaries
-        uses: actions/upload-artifact@v1
-        if: success()
-        with:
-          name: MCS-Snapshot-Build-Win64
-          path: dist/mcs_windows_amd64
-      -
-        name: Upload Linux Binaries
-        uses: actions/upload-artifact@v1
-        if: success()
-        with:
-          name: MCS-Snapshot-Build-Linux-amd64
-          path: dist/mcs_linux_amd64
-      -
-        name: Upload MacOS Binaries
-        uses: actions/upload-artifact@v1
-        if: success()
-        with:
-          name: MCS-Snapshot-Build-MacOSX-amd64
-          path: dist/mcs_darwin_amd64

.gitignore

@@ -31,3 +31,4 @@ public.crt
 # Ignore VsCode files
 .vscode/
 *.code-workspace
+*~

.goreleaser.yml

@@ -23,7 +23,7 @@ builds:
       - -trimpath
       - --tags=kqueue
     ldflags:
-      - -s -w -X github.com/minio/mcs/pkg.ReleaseTag={{.Tag}} -X github.com/minio/warp/pkg.CommitID={{.FullCommit}} -X github.com/minio/warp/pkg.Version={{.Version}} -X github.com/minio/warp/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/warp/pkg.ReleaseTime={{.Date}}
+      - -s -w -X github.com/minio/mcs/pkg.ReleaseTag={{.Tag}} -X github.com/minio/mcs/pkg.CommitID={{.FullCommit}} -X github.com/minio/mcs/pkg.Version={{.Version}} -X github.com/minio/mcs/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/mcs/pkg.ReleaseTime={{.Date}}
 archives:
   -
     replacements:

CREDITS

@@ -20967,6 +20967,31 @@ THE SOFTWARE.
 
 ================================================================
 
+go.uber.org/tools
+https://go.uber.org/tools
+----------------------------------------------------------------
+Copyright (c) 2017 Uber Technologies, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+================================================================
+
 go.uber.org/zap
 https://go.uber.org/zap
 ----------------------------------------------------------------
@@ -21025,6 +21050,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================
 
+golang.org/x/lint
+https://golang.org/x/lint
+----------------------------------------------------------------
+Copyright (c) 2013 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================
+
 golang.org/x/mod
 https://golang.org/x/mod
 ----------------------------------------------------------------
@@ -23786,3 +23844,29 @@ https://gopkg.in/yaml.v2
 
 ================================================================
 
+honnef.co/go/tools
+https://honnef.co/go/tools
+----------------------------------------------------------------
+Copyright (c) 2016 Dominik Honnef
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+================================================================
+

Dockerfile

@@ -1,8 +1,9 @@
-FROM golang:1.14.1
+FROM golang:1.13
 
 ADD go.mod /go/src/github.com/minio/mcs/go.mod
 ADD go.sum /go/src/github.com/minio/mcs/go.sum
 WORKDIR /go/src/github.com/minio/mcs/
+
 # Get dependencies - will also be cached if we won't change mod/sum
 RUN go mod download
 

cmd/mcs/main.go

@@ -21,6 +21,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"time"
 
 	"github.com/minio/mcs/pkg"
 
@@ -103,10 +104,12 @@ func newApp(name string) *cli.App {
 
 	app := cli.NewApp()
 	app.Name = name
-	app.Version = pkg.Version
+	app.Version = pkg.Version + " - " + pkg.ShortCommitID
 	app.Author = "MinIO, Inc."
-	app.Usage = "mcs"
+	app.Usage = "MinIO Console Server"
 	app.Description = `MinIO Console Server`
+	app.Copyright = "(c) 2020 MinIO, Inc."
+	app.Compiled, _ = time.Parse(time.RFC3339, pkg.ReleaseTime)
 	app.Commands = commands
 	app.HideHelpCommand = true // Hide `help, h` command, we already have `minio --help`.
 	app.CustomAppHelpTemplate = mcsHelpTemplate

go.mod

@@ -1,6 +1,6 @@
 module github.com/minio/mcs
 
-go 1.14
+go 1.13
 
 require (
 	github.com/coreos/go-oidc v2.2.1+incompatible

pkg/acl/config.go

@@ -0,0 +1,29 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package acl
+
+import (
+	"strings"
+
+	"github.com/minio/minio/pkg/env"
+)
+
+// GetOperatorOnly gets mcs operator mode status set on env variable
+//or default one
+func GetOperatorOnly() string {
+	return strings.ToLower(env.Get(McsOperatorOnly, "off"))
+}

pkg/acl/const.go

@@ -14,7 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-export const storageClasses = [
-  { label: "Standard", value: "STANDARD" },
-  { label: "Reduced Redundancy", value: "REDUCED_REDUNDANCY" },
-];
+package acl
+
+const (
+	McsOperatorOnly = "MCS_OPERATOR_ONLY"
+)

pkg/acl/endpoints.go

@@ -16,7 +16,9 @@
 
 package acl
 
-import iampolicy "github.com/minio/minio/pkg/iam/policy"
+import (
+	iampolicy "github.com/minio/minio/pkg/iam/policy"
+)
 
 // endpoints definition
 var (
@@ -33,8 +35,9 @@ var (
 	buckets         = "/buckets"
 	bucketsDetail   = "/buckets/:bucketName"
 	serviceAccounts = "/service-accounts"
-	clusters        = "/clusters"
-	clustersDetail  = "/clusters/:clusterName"
+	tenants         = "/tenants"
+	tenantsDetail   = "/tenants/:tenantName"
+	heal            = "/heal"
 )
 
 type ConfigurationActionSet struct {
@@ -189,12 +192,22 @@ var serviceAccountsActionSet = ConfigurationActionSet{
 	actions:     iampolicy.NewActionSet(),
 }
 
-// clustersActionSet temporally no actions needed for clusters sections to work
-var clustersActionSet = ConfigurationActionSet{
+// tenantsActionSet temporally no actions needed for tenants sections to work
+var tenantsActionSet = ConfigurationActionSet{
 	actionTypes: iampolicy.NewActionSet(),
 	actions:     iampolicy.NewActionSet(),
 }
 
+// healActionSet contains the list of admin actions required for this endpoint to work
+var healActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.HealAdminAction,
+	),
+}
+
 // endpointRules contains the mapping between endpoints and ActionSets, additional rules can be added here
 var endpointRules = map[string]ConfigurationActionSet{
 	configuration:   configurationActionSet,
@@ -210,10 +223,18 @@ var endpointRules = map[string]ConfigurationActionSet{
 	buckets:         bucketsActionSet,
 	bucketsDetail:   bucketsActionSet,
 	serviceAccounts: serviceAccountsActionSet,
-	clusters:        clustersActionSet,
-	clustersDetail:  clustersActionSet,
+	heal:            healActionSet,
 }
 
+// operatorRules contains the mapping between endpoints and ActionSets for operator only mode
+var operatorRules = map[string]ConfigurationActionSet{
+	tenants:       tenantsActionSet,
+	tenantsDetail: tenantsActionSet,
+}
+
+// operatorOnly ENV variable
+var operatorOnly = GetOperatorOnly()
+
 // GetActionsStringFromPolicy extract the admin/s3 actions from a given policy and return them in []string format
 //
 // ie:
@@ -263,13 +284,19 @@ func actionsStringToActionSet(actions []string) iampolicy.ActionSet {
 // GetAuthorizedEndpoints return a list of allowed endpoint based on a provided *iampolicy.Policy
 // ie: pages the user should have access based on his current privileges
 func GetAuthorizedEndpoints(actions []string) []string {
+	rangeTake := endpointRules
+
+	if operatorOnly == "on" {
+		rangeTake = operatorRules
+	}
+
 	if len(actions) == 0 {
 		return []string{}
 	}
 	// Prepare new ActionSet structure that will hold all the user actions
 	userAllowedAction := actionsStringToActionSet(actions)
 	allowedEndpoints := []string{}
-	for endpoint, rules := range endpointRules {
+	for endpoint, rules := range rangeTake {
 		// check if user policy matches s3:* or admin:* typesIntersection
 		endpointActionTypes := rules.actionTypes
 		typesIntersection := endpointActionTypes.Intersection(userAllowedAction)

pkg/acl/endpoints_test.go

@@ -23,21 +23,34 @@ import (
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 )
 
-func TestGetAuthorizedEndpoints(t *testing.T) {
-	type args struct {
-		actions []string
+type args struct {
+	actions []string
+}
+
+type endpoint struct {
+	name string
+	args args
+	want int
+}
+
+func validateEndpoints(t *testing.T, configs []endpoint) {
+	for _, tt := range configs {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := GetAuthorizedEndpoints(tt.args.actions); !reflect.DeepEqual(len(got), tt.want) {
+				t.Errorf("GetAuthorizedEndpoints() = %v, want %v", len(got), tt.want)
+			}
+		})
 	}
-	tests := []struct {
-		name string
-		args args
-		want int
-	}{
+}
+
+func TestGetAuthorizedEndpoints(t *testing.T) {
+	tests := []endpoint{
 		{
 			name: "dashboard endpoint",
 			args: args{
 				[]string{"admin:ServerInfo"},
 			},
-			want: 4,
+			want: 2,
 		},
 		{
 			name: "policies endpoint",
@@ -50,7 +63,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:ListUserPolicies",
 				},
 			},
-			want: 4,
+			want: 2,
 		},
 		{
 			name: "all admin endpoints",
@@ -59,7 +72,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:*",
 				},
 			},
-			want: 12,
+			want: 11,
 		},
 		{
 			name: "all s3 endpoints",
@@ -68,7 +81,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 6,
+			want: 4,
 		},
 		{
 			name: "all admin and s3 endpoints",
@@ -78,7 +91,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 15,
+			want: 14,
 		},
 		{
 			name: "no endpoints",
@@ -88,13 +101,52 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 			want: 0,
 		},
 	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := GetAuthorizedEndpoints(tt.args.actions); !reflect.DeepEqual(len(got), tt.want) {
-				t.Errorf("GetAuthorizedEndpoints() = %v, want %v", len(got), tt.want)
-			}
-		})
+
+	validateEndpoints(t, tests)
+}
+
+func TestOperatorOnlyEndpoints(t *testing.T) {
+	operatorOnly = "on"
+
+	tests := []endpoint{
+		{
+			name: "Operator Only - all admin endpoints",
+			args: args{
+				[]string{
+					"admin:*",
+				},
+			},
+			want: 2,
+		},
+		{
+			name: "Operator Only - all s3 endpoints",
+			args: args{
+				[]string{
+					"s3:*",
+				},
+			},
+			want: 2,
+		},
+		{
+			name: "Operator Only - all admin and s3 endpoints",
+			args: args{
+				[]string{
+					"admin:*",
+					"s3:*",
+				},
+			},
+			want: 2,
+		},
+		{
+			name: "Operator Only - no endpoints",
+			args: args{
+				[]string{},
+			},
+			want: 0,
+		},
 	}
+
+	validateEndpoints(t, tests)
 }
 
 func TestGetActionsStringFromPolicy(t *testing.T) {

portal-ui/package.json

@@ -21,6 +21,7 @@
     "@types/webpack-env": "^1.14.1",
     "@types/websocket": "^1.0.0",
     "ansi-to-react": "^6.0.5",
+    "chart.js": "^2.9.3",
     "codemirror": "^5.52.2",
     "history": "^4.10.1",
     "local-storage-fallback": "^4.1.1",
@@ -28,6 +29,7 @@
     "moment": "^2.24.0",
     "npm": "^6.14.4",
     "react": "^16.13.1",
+    "react-chartjs-2": "^2.9.0",
     "react-codemirror2": "^7.1.0",
     "react-dom": "^16.12.0",
     "react-moment": "^0.9.7",

portal-ui/src/common/utils.ts

@@ -25,6 +25,7 @@ export const units = [
   "ZiB",
   "YiB",
 ];
+export const k8sUnits = ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei"];
 export const niceBytes = (x: string) => {
   let l = 0,
     n = parseInt(x, 10) || 0;
@@ -65,6 +66,13 @@ export const factorForDropdown = () => {
   });
 };
 
+// units to be used in a dropdown
+export const k8sfactorForDropdown = () => {
+  return k8sUnits.map((unit) => {
+    return { label: unit, value: unit };
+  });
+};
+
 //getBytes, converts from a value and a unit from units array to bytes
 export const getBytes = (value: string, unit: string) => {
   const vl: number = parseFloat(value);

portal-ui/src/icons/BucketsIcon.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -14,22 +14,18 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 import React from "react";
-import {SvgIcon} from "@material-ui/core";
+import { SvgIcon } from "@material-ui/core";
 class BucketsIcon extends React.Component {
-    render() {
-        return (<SvgIcon>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-                <title>ic_h_buckets</title>
-                <g id="Layer_2" data-name="Layer 2">
-                    <g id="Layer_1-2" data-name="Layer 1">
-                        <polygon className="cls-1" points="13.428 16 2.572 16 0 0 16 0 13.428 16"/>
-                    </g>
-                </g>
-            </svg>
-        </SvgIcon>)
-    }
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+          <path d="M8.392,10H1.608L0,0H10Z" />
+        </svg>
+      </SvgIcon>
+    );
+  }
 }
 
 export default BucketsIcon;

portal-ui/src/icons/ClustersIcon.tsx

@@ -0,0 +1,123 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class ClustersIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
+          <g transform="translate(79 438.479)">
+            <g>
+              <g>
+                <rect x="-77.9" y="-434.5" width="7.8" height="1" />
+              </g>
+            </g>
+            <g>
+              <g>
+                <rect
+                  x="-77.9"
+                  y="-434.5"
+                  transform="matrix(0.4999 -0.8661 0.8661 0.4999 338.8698 -281.1237)"
+                  width="7.8"
+                  height="1"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <rect
+                  x="-74.5"
+                  y="-437.9"
+                  transform="matrix(0.866 -0.5001 0.5001 0.866 207.1129 -95.1668)"
+                  width="1"
+                  height="7.8"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <path
+                  d="M-71.8-430.1h-4.5l-2.2-3.9l2.2-3.9h4.5l2.2,3.9L-71.8-430.1z M-75.7-431.1h3.3l1.7-2.9l-1.7-2.9h-3.3
+				l-1.7,2.9L-75.7-431.1z"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <path
+                  d="M-72.3-434c0,0.9-0.7,1.7-1.7,1.7c-0.9,0-1.7-0.7-1.7-1.7c0-0.9,0.7-1.7,1.7-1.7
+				C-73.1-435.7-72.3-434.9-72.3-434z"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <path
+                  d="M-76.8-434c0,0.6-0.5,1.1-1.1,1.1c0,0,0,0,0,0c-0.6,0-1.1-0.5-1.1-1.1c0,0,0,0,0,0c0-0.6,0.5-1.1,1.1-1.1
+				c0,0,0,0,0,0C-77.3-435.1-76.8-434.6-76.8-434C-76.8-434-76.8-434-76.8-434z"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <path
+                  d="M-69-434c0,0.6-0.5,1.1-1.1,1.1c0,0,0,0,0,0c-0.6,0-1.1-0.5-1.1-1.1c0,0,0,0,0,0c0-0.6,0.5-1.1,1.1-1.1
+				c0,0,0,0,0,0C-69.5-435.1-69-434.6-69-434C-69-434-69-434-69-434z"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <path
+                  d="M-75.4-431.6c0.5,0.3,0.7,1,0.4,1.5c-0.3,0.5-1,0.7-1.5,0.4c0,0,0,0,0,0c-0.5-0.3-0.7-1-0.4-1.5
+				C-76.6-431.7-75.9-431.9-75.4-431.6C-75.4-431.6-75.4-431.6-75.4-431.6z"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <path
+                  d="M-71.5-438.3c0.5,0.3,0.7,1,0.4,1.5c-0.3,0.5-1,0.7-1.5,0.4c0,0,0,0,0,0c-0.5-0.3-0.7-1-0.4-1.5
+				C-72.7-438.5-72-438.6-71.5-438.3C-71.5-438.3-71.5-438.3-71.5-438.3z"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <path
+                  d="M-72.6-431.6c0.5-0.3,1.2-0.1,1.5,0.4c0,0,0,0,0,0c0.3,0.5,0.1,1.2-0.4,1.5c-0.5,0.3-1.2,0.1-1.5-0.4
+				c0,0,0,0,0,0C-73.3-430.6-73.1-431.3-72.6-431.6z"
+                />
+              </g>
+            </g>
+            <g>
+              <g>
+                <path
+                  d="M-76.5-438.3c0.5-0.3,1.2-0.1,1.5,0.4c0,0,0,0,0,0c0.3,0.5,0.1,1.2-0.4,1.5c-0.5,0.3-1.2,0.1-1.5-0.4
+				c0,0,0,0,0,0C-77.2-437.3-77-438-76.5-438.3z"
+                />
+              </g>
+            </g>
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default ClustersIcon;

portal-ui/src/icons/ConfigurationsListIcon.tsx

@@ -0,0 +1,42 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class ConfigurationsListIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+          <rect width="1.433" height="1" />
+          <rect width="7.828" height="1" transform="translate(2.172)" />
+          <rect width="1.433" height="1" transform="translate(0 6)" />
+          <rect width="1.433" height="1" transform="translate(0 3)" />
+          <rect width="1.433" height="1" transform="translate(0 9)" />
+          <rect width="1.368" height="0.569" transform="translate(6.316 9)" />
+          <path d="M5.566,9.569v-.31l-.238-.138-.269.155-.65.375L4.034,9V9H2.172v1H5.566Z" />
+          <path d="M9.966,9l-.375.65-.65-.375-.269-.155-.238.138V10H10V9H9.967Z" />
+          <path d="M3.625,6.793l.269-.155V6.362l-.269-.155L3.266,6H2.172V7H3.266Z" />
+          <path d="M8.434,3.431v.31l.238.138.269-.155.649-.375L9.966,4V4H10V3H8.434Z" />
+          <path d="M4.034,4l.375-.65.65.375.269.155.238-.138V3H2.172V4H4.033Z" />
+          <path d="M9.356,5.929,10,5.558,9.316,4.373l-.644.372-.988-.571V3.431H6.316v.743l-.988.571-.644-.372L4,5.558l.644.371V7.071L4,7.442l.684,1.185.644-.372.988.571v.743H7.684V8.826l.988-.571.644.372L10,7.442l-.644-.371ZM7,7.278A.778.778,0,1,1,7.778,6.5.779.779,0,0,1,7,7.278Z" />
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default ConfigurationsListIcon;

portal-ui/src/icons/DashboardIcon.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -20,15 +20,24 @@ class DashboardIcon extends React.Component {
   render() {
     return (
       <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-          <title>ic_h_dashboard</title>
-          <g id="Layer_2" data-name="Layer 2">
-            <g id="Layer_1-2" data-name="Layer 1">
-              <rect className="cls-1" x="9" width="7" height="7" />
-              <rect className="cls-1" width="7" height="7" />
-              <rect className="cls-1" x="9" y="9" width="7" height="7" />
-              <rect className="cls-1" y="9" width="7" height="7" />
-            </g>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+          <g transform="translate(249 720)">
+            <rect
+              width="6"
+              height="5"
+              transform="translate(-244 -720) rotate(90)"
+            />
+            <rect width="4" height="4" transform="translate(-243 -720)" />
+            <rect
+              width="5"
+              height="4"
+              transform="translate(-239 -715) rotate(90)"
+            />
+            <rect
+              width="5"
+              height="3"
+              transform="translate(-244 -710) rotate(180)"
+            />
           </g>
         </svg>
       </SvgIcon>

portal-ui/src/icons/GroupsIcon.tsx

@@ -0,0 +1,41 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class GroupsIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9.787">
+          <g transform="translate(177 719.787)">
+            <g transform="translate(-105 -720)">
+              <path d="M-65,5a3,3,0,0,0-1.131.224A3.981,3.981,0,0,1-65,8v2h3V8A3,3,0,0,0-65,5Z" />
+              <path d="M-72,10h6V8a3,3,0,0,0-3-3,3,3,0,0,0-3,3Z" />
+              <path
+                className="a"
+                d="M-65,.213a1.993,1.993,0,0,0-1.384.561A2.967,2.967,0,0,1-66,2.213a2.964,2.964,0,0,1-.384,1.439A1.989,1.989,0,0,0-65,4.213a2,2,0,0,0,2-2A2,2,0,0,0-65,.213Z"
+              />
+              <circle cx="2" cy="2" r="2" transform="translate(-71 0.213)" />
+            </g>
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default GroupsIcon;

portal-ui/src/icons/IAMPoliciesIcon.tsx

@@ -0,0 +1,34 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class BucketsIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.75 10">
+          <path
+            d="M-44.625,10l-4.353-2.419L-53.375,10V0h8.75Z"
+            transform="translate(53.375)"
+          />
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default BucketsIcon;

portal-ui/src/icons/LambdaNotificationsIcon.tsx

@@ -0,0 +1,34 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class LambdaNotificationsIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+          <path
+            d="M0,0v10l2.8-2.2H10V0H0z M6.6,6L5.6,6.4l-0.8-2l-1.5,2L2.5,5.9l1.9-2.6L4.1,2.4H3.2v-1h1.5l1.4,3.7l0.9-0.4
+	l0.4,0.9L6.6,6z"
+          />
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default LambdaNotificationsIcon;

portal-ui/src/icons/MirroringIcon.tsx

@@ -0,0 +1,35 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class MirroringIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+          <g transform="translate(61 439)">
+            <rect width="1.5" height="10" transform="translate(-56.75 -439)" />
+            <path d="M6.5,10V0h.572L10,10Z" transform="translate(-61 -439)" />
+            <path d="M3.5,10V0H2.928L0,10Z" transform="translate(-61 -439)" />
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default MirroringIcon;

portal-ui/src/icons/ServiceAccountsIcon.tsx

@@ -0,0 +1,41 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class ServiceAccountsIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9.5">
+          <g transform="translate(231 719.516)">
+            <path
+              d="M-125.5,7.984a4.5,4.5,0,0,1,4.5-4.5,4.5,4.5,0,0,1,4.5,4.5Z"
+              transform="translate(-105 -720)"
+            />
+            <rect width="10" height="1" transform="translate(-231 -711.016)" />
+            <path
+              d="M-119.5.484h-3v1h1v1h1v-1h1Z"
+              transform="translate(-105 -720)"
+            />
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default ServiceAccountsIcon;

portal-ui/src/icons/TraceIcon.tsx

@@ -0,0 +1,62 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class TraceIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9.998 10">
+          <g transform="translate(140.999 720)">
+            <g transform="translate(-105 -720)">
+              <rect
+                width="1.114"
+                height="1.667"
+                transform="translate(-27.116 8.333)"
+              />
+              <path d="M-28.184,10H-29.3V8.154l2.182-3.037V3.147H-26V5.476l-2.182,3.037Z" />
+              <rect
+                width="1.114"
+                height="2.963"
+                transform="translate(-31.531)"
+              />
+              <rect
+                width="1.114"
+                height="2.132"
+                transform="translate(-27.115 0)"
+              />
+              <rect
+                width="1.114"
+                height="5.389"
+                transform="translate(-29.298)"
+              />
+              <path d="M-30.417,10h-1.114V5.722l-2.233-3V0h1.114V2.353l2.233,3Z" />
+              <path d="M-32.65,10h-1.114V6.185l-2.234-3V0h1.114V2.815l2.234,3Z" />
+              <rect
+                width="1.114"
+                height="4.463"
+                transform="translate(-35.999 5.537)"
+              />
+            </g>
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default TraceIcon;

portal-ui/src/icons/UsersIcon.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -14,27 +14,32 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 import React from "react";
-import {SvgIcon} from "@material-ui/core";
+import { SvgIcon } from "@material-ui/core";
 class UsersIcon extends React.Component {
-    render() {
-        return (<SvgIcon>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 14.874">
-                <title>ic_users</title>
-                <g id="Layer_2" data-name="Layer 2">
-                    <g id="Layer_1-2" data-name="Layer 1">
-                        <path className="cls-1"
-                              d="M3.5,6.875h0a3.5,3.5,0,0,1,3.5,3.5v4.5a0,0,0,0,1,0,0H0a0,0,0,0,1,0,0v-4.5A3.5,3.5,0,0,1,3.5,6.875Z"/>
-                        <path className="cls-1"
-                              d="M12.5,6.875h0a3.5,3.5,0,0,1,3.5,3.5v4.5a0,0,0,0,1,0,0H9a0,0,0,0,1,0,0v-4.5A3.5,3.5,0,0,1,12.5,6.875Z"/>
-                        <circle className="cls-1" cx="3.498" cy="2.859" r="2.859"/>
-                        <circle className="cls-1" cx="12.502" cy="2.859" r="2.859"/>
-                    </g>
-                </g>
-            </svg>
-        </SvgIcon>)
-    }
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6.131 10">
+          <g transform="translate(193 719.787)">
+            <g transform="translate(-193 -719.787)">
+              <path
+                d="M3,0h.131a3,3,0,0,1,3,3V5a0,0,0,0,1,0,0H0A0,0,0,0,1,0,5V3A3,3,0,0,1,3,0Z"
+                transform="translate(0 5)"
+              />
+              <ellipse
+                cx="2.065"
+                cy="2"
+                rx="2.065"
+                ry="2"
+                transform="translate(1 0)"
+              />
+            </g>
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
 }
 
 export default UsersIcon;

portal-ui/src/icons/WarpIcon.tsx

@@ -0,0 +1,39 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class WarpIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+          <g transform="translate(43 439)">
+            <path d="M27.5,10" transform="translate(-61 -439)" />
+            <rect width="1.5" height="2" transform="translate(-43 -431)" />
+            <rect width="1.5" height="6" transform="translate(-38.75 -435)" />
+            <rect width="1.5" height="8" transform="translate(-36.625 -437)" />
+            <rect width="1.5" height="4" transform="translate(-40.875 -433)" />
+            <rect width="1.5" height="10" transform="translate(-34.5 -439)" />
+            <path d="M18.5,10" transform="translate(-61 -439)" />
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default WarpIcon;

portal-ui/src/icons/WatchIcon.tsx

@@ -0,0 +1,59 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class WatchIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+          <g transform="translate(213 720)">
+            <g transform="translate(-105 -720)">
+              <rect width="1.5" height="4" transform="translate(-108)" />
+              <rect width="1.5" height="4" transform="translate(-108 6)" />
+              <rect width="1.5" height="4" transform="translate(-99.5 6)" />
+              <rect width="1.5" height="4" transform="translate(-99.5)" />
+              <rect
+                width="1.5"
+                height="4"
+                transform="translate(-98) rotate(90)"
+              />
+              <rect
+                width="1.5"
+                height="4"
+                transform="translate(-104) rotate(90)"
+              />
+              <rect
+                width="1.5"
+                height="4"
+                transform="translate(-104 8.5) rotate(90)"
+              />
+              <rect
+                width="1.5"
+                height="4"
+                transform="translate(-98 8.5) rotate(90)"
+              />
+              <circle cx="2" cy="2" r="2" transform="translate(-105 3)" />
+            </g>
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default WatchIcon;

portal-ui/src/icons/index.ts

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -14,10 +14,20 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-export { default as PermissionIcon } from './PermissionIcon';
-export { default as CreateIcon } from './CreateIcon';
-export { default as DeleteIcon } from './DeleteIcon';
-export { default as ServiceAccountIcon } from './ServiceAccountIcon';
-export { default as DashboardIcon } from './DashboardIcon';
-export { default as BucketsIcon } from './BucketsIcon';
-export { default as UsersIcon } from './UsersIcon';
+export { default as PermissionIcon } from "./PermissionIcon";
+export { default as CreateIcon } from "./CreateIcon";
+export { default as DeleteIcon } from "./DeleteIcon";
+export { default as ServiceAccountIcon } from "./ServiceAccountIcon";
+export { default as DashboardIcon } from "./DashboardIcon";
+export { default as BucketsIcon } from "./BucketsIcon";
+export { default as UsersIcon } from "./UsersIcon";
+export { default as ServiceAccountsIcon } from "./ServiceAccountsIcon";
+export { default as GroupsIcon } from "./GroupsIcon";
+export { default as IAMPoliciesIcon } from "./IAMPoliciesIcon";
+export { default as TraceIcon } from "./TraceIcon";
+export { default as LambdaNotificationsIcon } from "./LambdaNotificationsIcon";
+export { default as ConfigurationsListIcon } from "./ConfigurationsListIcon";
+export { default as ClustersIcon } from "./ClustersIcon";
+export { default as MirroringIcon } from "./MirroringIcon";
+export { default as WarpIcon } from "./WarpIcon";
+export { default as WatchIcon } from "./WatchIcon";

portal-ui/src/screens/Console/Console.tsx

@@ -49,7 +49,7 @@ import Buckets from "./Buckets/Buckets";
 import Policies from "./Policies/Policies";
 import Permissions from "./Permissions/Permissions";
 import Dashboard from "./Dashboard/Dashboard";
-import Menu from "./Menu";
+import Menu from "./Menu/Menu";
 import api from "../../common/api";
 import storage from "local-storage-fallback";
 import NotFoundPage from "../NotFoundPage";
@@ -62,11 +62,12 @@ import { Button, LinearProgress } from "@material-ui/core";
 import WebhookPanel from "./Configurations/ConfigurationPanels/WebhookPanel";
 import Trace from "./Trace/Trace";
 import Logs from "./Logs/Logs";
+import Heal from "./Heal/Heal";
 import Watch from "./Watch/Watch";
-import ListClusters from "./Clusters/ListClusters/ListClusters";
+import ListTenants from "./Tenants/ListTenants/ListTenants";
 import { ISessionResponse } from "./types";
 import { saveSessionResponse } from "./actions";
-import ClusterDetails from "./Clusters/ClusterDetails/ClusterDetails";
+import TenantDetails from "./Tenants/TenantDetails/TenantDetails";
 
 function Copyright() {
   return (
@@ -132,6 +133,7 @@ const styles = (theme: Theme) =>
         easing: theme.transitions.easing.sharp,
         duration: theme.transitions.duration.enteringScreen,
       }),
+      overflowX: "hidden",
     },
     drawerPaperClose: {
       overflowX: "hidden",
@@ -271,6 +273,10 @@ const Console = ({
       component: Logs,
       path: "/logs",
     },
+    {
+      component: Heal,
+      path: "/heal",
+    },
     {
       component: ListNotificationEndpoints,
       path: "/notification-endpoints",
@@ -296,11 +302,11 @@ const Console = ({
       path: "/webhook/audit",
     },
     {
-      component: ListClusters,
-      path: "/clusters",
+      component: ListTenants,
+      path: "/tenants",
     },
     {
-      component: ClusterDetails,
+      component: TenantDetails,
       path: "/clusters/:clusterName",
     },
   ];

portal-ui/src/screens/Console/Heal/Heal.tsx

@@ -0,0 +1,327 @@
+import { HorizontalBar } from "react-chartjs-2";
+import React, { useEffect, useState } from "react";
+import {
+  Button,
+  Grid,
+  Typography,
+  TextField,
+  Checkbox,
+} from "@material-ui/core";
+import { IMessageEvent, w3cwebsocket as W3CWebSocket } from "websocket";
+import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
+import { wsProtocol } from "../../../utils/wsUtils";
+import api from "../../../common/api";
+import { FormControl, MenuItem, Select } from "@material-ui/core";
+import { BucketList, Bucket } from "../Watch/types";
+import { HealStatus, colorH } from "./types";
+import { niceBytes } from "../../../common/utils";
+
+const styles = (theme: Theme) =>
+  createStyles({
+    watchList: {
+      background: "white",
+      maxHeight: "400",
+      overflow: "auto",
+      "& ul": {
+        margin: "4",
+        padding: "0",
+      },
+      "& ul li": {
+        listStyle: "none",
+        margin: "0",
+        padding: "0",
+        borderBottom: "1px solid #dedede",
+      },
+    },
+    actionsTray: {
+      textAlign: "right",
+      "& button": {
+        marginLeft: 10,
+      },
+    },
+    inputField: {
+      background: "#FFFFFF",
+      padding: 12,
+      borderRadius: 5,
+      marginLeft: 10,
+      boxShadow: "0px 3px 6px #00000012",
+    },
+    fieldContainer: {
+      background: "#FFFFFF",
+      padding: 0,
+      borderRadius: 5,
+      marginLeft: 10,
+      textAlign: "left",
+      minWidth: "206",
+      boxShadow: "0px 3px 6px #00000012",
+    },
+    lastElementWPadding: {
+      paddingRight: "78",
+    },
+  });
+
+interface IHeal {
+  classes: any;
+}
+
+const Heal = ({ classes }: IHeal) => {
+  const [start, setStart] = useState(false);
+  const [bucketName, setBucketName] = useState("Select Bucket");
+  const [bucketList, setBucketList] = useState<Bucket[]>([]);
+  const [prefix, setPrefix] = useState("");
+  const [recursive, setRecursive] = useState(false);
+  const [forceStart, setForceStart] = useState(false);
+  const [forceStop, setForceStop] = useState(false);
+  // healStatus states
+  const [hStatus, setHStatus] = useState({
+    beforeHeal: [0, 0, 0, 0],
+    afterHeal: [0, 0, 0, 0],
+    objectsHealed: 0,
+    objectsScanned: 0,
+    healDuration: 0,
+    sizeScanned: "",
+  });
+
+  const fetchBucketList = () => {
+    api
+      .invoke("GET", `/api/v1/buckets`)
+      .then((res: BucketList) => {
+        let buckets: Bucket[] = [];
+        if (res.buckets !== null) {
+          buckets = res.buckets;
+        }
+        setBucketList(buckets);
+      })
+      .catch((err: any) => {
+        console.log(err);
+      });
+  };
+
+  useEffect(() => {
+    fetchBucketList();
+  }, []);
+
+  // forceStart and forceStop need to be mutually exclusive
+  useEffect(() => {
+    if (forceStart === true) {
+      setForceStop(false);
+    }
+  }, [forceStart]);
+
+  useEffect(() => {
+    if (forceStop === true) {
+      setForceStart(false);
+    }
+  }, [forceStop]);
+
+  const colorHealthArr = (color: colorH) => {
+    return [color.Green, color.Yellow, color.Red, color.Grey];
+  };
+
+  useEffect(() => {
+    // begin watch if bucketName in bucketList and start pressed
+    if (start) {
+      // values stored here to update chart
+      const cB: colorH = { Green: 0, Yellow: 0, Red: 0, Grey: 0 };
+      const cA: colorH = { Green: 0, Yellow: 0, Red: 0, Grey: 0 };
+
+      const url = new URL(window.location.toString());
+      const isDev = process.env.NODE_ENV === "development";
+      const port = isDev ? "9090" : url.port;
+
+      const wsProt = wsProtocol(url.protocol);
+      const c = new W3CWebSocket(
+        `${wsProt}://${url.hostname}:${port}/ws/heal/${bucketName}?prefix=${prefix}&recursive=${recursive}&force-start=${forceStart}&force-stop=${forceStop}`
+      );
+
+      if (c !== null) {
+        c.onopen = () => {
+          console.log("WebSocket Client Connected");
+          c.send("ok");
+        };
+        c.onmessage = (message: IMessageEvent) => {
+          let m: HealStatus = JSON.parse(message.data.toString());
+          // Store percentage per health color
+          for (const [key, value] of Object.entries(m.healthAfterCols)) {
+            cA[key] = (value * 100) / m.itemsScanned;
+          }
+          for (const [key, value] of Object.entries(m.healthBeforeCols)) {
+            cB[key] = (value * 100) / m.itemsScanned;
+          }
+          setHStatus({
+            beforeHeal: colorHealthArr(cB),
+            afterHeal: colorHealthArr(cA),
+            objectsHealed: m.objectsHealed,
+            objectsScanned: m.objectsScanned,
+            healDuration: m.healDuration,
+            sizeScanned: niceBytes(m.bytesScanned.toString()),
+          });
+        };
+        c.onclose = () => {
+          setStart(false);
+          console.log("connection closed by server");
+        };
+        return () => {
+          // close websocket on useEffect cleanup
+          c.close(1000);
+          console.log("closing websockets");
+        };
+      }
+    }
+  }, [start]);
+
+  let data = {
+    labels: ["Green", "Yellow", "Red", "Grey"],
+    datasets: [
+      {
+        label: "After Healing",
+        data: hStatus.afterHeal,
+        backgroundColor: "rgba(0, 0, 255, 0.2)",
+        borderColor: "rgba(54, 162, 235, 1)",
+        borderWidth: 1,
+      },
+      {
+        label: "Before Healing",
+        data: hStatus.beforeHeal,
+        backgroundColor: "rgba(153, 102, 255, 0.2)",
+        borderColor: "rgba(153, 102, 255, 1)",
+        borderWidth: 1,
+      },
+    ],
+  };
+  const bucketNames = bucketList.map((bucketName) => ({
+    label: bucketName.name,
+    value: bucketName.name,
+  }));
+  return (
+    <React.Fragment>
+      <Grid container>
+        <Grid item xs={12}>
+          <Typography variant="h6">Heal</Typography>
+        </Grid>
+        <Grid item xs={12}>
+          <br />
+        </Grid>
+        <Grid item xs={12} className={classes.actionsTray}>
+          <FormControl variant="outlined">
+            <Select
+              id="bucket-name"
+              name="bucket-name"
+              value={bucketName}
+              onChange={(e) => {
+                setBucketName(e.target.value as string);
+              }}
+              className={classes.fieldContainer}
+              disabled={false}
+            >
+              <MenuItem value="" key={`select-bucket-name-default`}>
+                Select Bucket
+              </MenuItem>
+              {bucketNames.map((option) => (
+                <MenuItem
+                  value={option.value}
+                  key={`select-bucket-name-${option.label}`}
+                >
+                  {option.label}
+                </MenuItem>
+              ))}
+            </Select>
+          </FormControl>
+          <TextField
+            placeholder="Prefix"
+            className={classes.inputField}
+            id="prefix-resource"
+            label=""
+            disabled={false}
+            InputProps={{
+              disableUnderline: true,
+            }}
+            onChange={(e) => {
+              setPrefix(e.target.value);
+            }}
+          />
+          <Button
+            type="submit"
+            variant="contained"
+            color="primary"
+            disabled={start}
+            onClick={() => setStart(true)}
+          >
+            Start
+          </Button>
+          <Grid item xs={12}>
+            <span>{"Recursive"}</span>
+            <Checkbox
+              name="recursive"
+              id="recursive"
+              value="recursive"
+              color="primary"
+              inputProps={{ "aria-label": "secondary checkbox" }}
+              checked={recursive}
+              onChange={(e) => {
+                setRecursive(e.target.checked);
+              }}
+              disabled={false}
+            />
+            <span>{"Force Start"}</span>
+            <Checkbox
+              name="recursive"
+              id="recursive"
+              value="recursive"
+              color="primary"
+              inputProps={{ "aria-label": "secondary checkbox" }}
+              checked={forceStart}
+              onChange={(e) => {
+                setForceStart(e.target.checked);
+              }}
+              disabled={false}
+            />
+            <span>{"Force Stop"}</span>
+            <Checkbox
+              name="recursive"
+              id="recursive"
+              value="recursive"
+              color="primary"
+              inputProps={{ "aria-label": "secondary checkbox" }}
+              checked={forceStop}
+              onChange={(e) => {
+                setForceStop(e.target.checked);
+              }}
+              disabled={false}
+            />
+            <span className={classes.lastElementWPadding}>{""}</span>
+          </Grid>
+        </Grid>
+        <Grid item xs={12}>
+          <br />
+        </Grid>
+        <HorizontalBar
+          data={data}
+          width={100}
+          height={30}
+          options={{
+            title: {
+              display: true,
+              text: "Item's Health Status [%]",
+              fontSize: 20,
+            },
+            legend: {
+              display: true,
+              position: "right",
+            },
+          }}
+        />
+        <Grid item xs={12}>
+          <br />
+          Size scanned: {hStatus.sizeScanned}
+          <br />
+          Objects healed: {hStatus.objectsHealed} / {hStatus.objectsScanned}
+          <br />
+          Healing time: {hStatus.healDuration}s
+        </Grid>
+      </Grid>
+    </React.Fragment>
+  );
+};
+
+export default withStyles(styles)(Heal);

portal-ui/src/screens/Console/Heal/types.ts

@@ -0,0 +1,64 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+export interface HealDriveInfo {
+  uuid: string;
+  endpoint: string;
+  state: string;
+}
+
+export interface MomentHealth {
+  color: string;
+  offline: number;
+  online: number;
+  missing: number;
+  corrupted: number;
+  drives: HealDriveInfo[];
+}
+
+export interface HealItemStatus {
+  status: string;
+  error: string;
+  type: string;
+  name: string;
+  before: MomentHealth;
+  after: MomentHealth;
+  size: number;
+}
+
+export interface HealStatus {
+  healDuration: number;
+  bytesScanned: number;
+  objectsScanned: number;
+  itemsScanned: number;
+  // Counters for healed objects and all kinds of healed items
+  objectsHealed: number;
+  itemsHealed: number;
+
+  itemsHealthStatus: HealItemStatus[];
+  // Map of health color code to number of objects with that
+  // health color code.
+  healthBeforeCols: Map<string, number>;
+  healthAfterCols: Map<string, number>;
+}
+
+// colorH used to save health's percentage per color
+export interface colorH {
+  [Green: string]: number;
+  Yellow: number;
+  Red: number;
+  Grey: number;
+}

portal-ui/src/screens/Console/Menu.tsx

@@ -1,306 +0,0 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program 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 Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from "react";
-import ListItem from "@material-ui/core/ListItem";
-import ListItemIcon from "@material-ui/core/ListItemIcon";
-import RoomServiceIcon from "@material-ui/icons/RoomService";
-import WebAssetIcon from "@material-ui/icons/WebAsset";
-import CenterFocusWeakIcon from "@material-ui/icons/CenterFocusWeak";
-import StorageIcon from "@material-ui/icons/Storage";
-import ListItemText from "@material-ui/core/ListItemText";
-import { NavLink } from "react-router-dom";
-import { Divider, Typography, withStyles } from "@material-ui/core";
-import { ExitToApp } from "@material-ui/icons";
-import { AppState } from "../../store";
-import { connect } from "react-redux";
-import { userLoggedIn } from "../../actions";
-import List from "@material-ui/core/List";
-import storage from "local-storage-fallback";
-import history from "../../history";
-import logo from "../../icons/minio_console_logo.svg";
-import {
-  BucketsIcon,
-  DashboardIcon,
-  PermissionIcon,
-  UsersIcon,
-} from "../../icons";
-import { createStyles, Theme } from "@material-ui/core/styles";
-import PersonIcon from "@material-ui/icons/Person";
-import api from "../../common/api";
-import NotificationsIcon from "@material-ui/icons/Notifications";
-import ListAltIcon from "@material-ui/icons/ListAlt";
-import LoopIcon from "@material-ui/icons/Loop";
-
-const styles = (theme: Theme) =>
-  createStyles({
-    logo: {
-      paddingTop: "42px",
-      marginBottom: "20px",
-      textAlign: "center",
-      "& img": {
-        width: "120px",
-      },
-    },
-    menuList: {
-      "& .active": {
-        borderTopLeftRadius: "3px",
-        borderBottomLeftRadius: "3px",
-        color: "white",
-        background:
-          "transparent linear-gradient(90deg, #362585 0%, #362585 7%, #281B6F 39%, #1F1661 100%) 0% 0% no-repeat padding-box",
-        "& .MuiSvgIcon-root": {
-          color: "white",
-        },
-      },
-      "& .MuiListItem-root": {
-        marginTop: "16px",
-      },
-      paddingLeft: "30px",
-      "& .MuiSvgIcon-root": {
-        fontSize: "18px",
-        color: "#393939",
-      },
-      "& .MuiListItemIcon-root": {
-        minWidth: "40px",
-      },
-      "& .MuiTypography-root": {
-        fontSize: "14px",
-      },
-      "& .MuiListItem-gutters": {
-        paddingRight: "0px",
-      },
-    },
-  });
-
-const mapState = (state: AppState) => ({
-  open: state.system.loggedIn,
-});
-
-const connector = connect(mapState, { userLoggedIn });
-
-interface MenuProps {
-  classes: any;
-  userLoggedIn: typeof userLoggedIn;
-  pages: string[];
-}
-
-class Menu extends React.Component<MenuProps> {
-  logout() {
-    const deleteSession = () => {
-      storage.removeItem("token");
-      this.props.userLoggedIn(false);
-      history.push("/");
-    };
-    api
-      .invoke("POST", `/api/v1/logout`)
-      .then(() => {
-        deleteSession();
-      })
-      .catch((err: any) => {
-        console.log(err);
-        deleteSession();
-      });
-  }
-
-  render() {
-    const { classes, pages } = this.props;
-    const allowedPages = pages.reduce((result: any, item: any, index: any) => {
-      result[item] = true;
-      return result;
-    }, {});
-
-    const menu = [
-      {
-        type: "item",
-        component: NavLink,
-        to: "/dashboard",
-        name: "Dashboard",
-        icon: <DashboardIcon />,
-      },
-      {
-        type: "item",
-        component: NavLink,
-        to: "/buckets",
-        name: "Buckets",
-        icon: <BucketsIcon />,
-      },
-      {
-        type: "item",
-        component: NavLink,
-        to: "/service-accounts",
-        name: "Service Accounts",
-        icon: <RoomServiceIcon />,
-        forceDisplay: true,
-      },
-      {
-        type: "item",
-        component: NavLink,
-        to: "/watch",
-        name: "Watch",
-        icon: <CenterFocusWeakIcon />,
-      },
-      {
-        type: "divider",
-        key: "divider-1",
-      },
-      {
-        type: "title",
-        name: "Admin",
-        component: Typography,
-      },
-      {
-        group: "Admin",
-        type: "item",
-        component: NavLink,
-        to: "/users",
-        name: "Users",
-        icon: <PersonIcon />,
-      },
-      {
-        group: "Admin",
-        type: "item",
-        component: NavLink,
-        to: "/groups",
-        name: "Groups",
-        icon: <UsersIcon />,
-      },
-      {
-        group: "Admin",
-        type: "item",
-        component: NavLink,
-        to: "/policies",
-        name: "IAM Policies",
-        icon: <PermissionIcon />,
-      },
-      {
-        group: "Admin",
-        type: "item",
-        component: NavLink,
-        to: "/trace",
-        name: "Trace",
-        icon: <LoopIcon />,
-      },
-      {
-        group: "Admin",
-        type: "item",
-        component: NavLink,
-        to: "/logs",
-        name: "Console Logs",
-        icon: <WebAssetIcon />,
-      },
-      {
-        type: "title",
-        name: "Configuration",
-        component: Typography,
-      },
-      {
-        group: "Configuration",
-        type: "item",
-        component: NavLink,
-        to: "/notification-endpoints",
-        name: "Lambda Notifications",
-        icon: <NotificationsIcon />,
-      },
-      {
-        group: "Configuration",
-        type: "item",
-        component: NavLink,
-        to: "/configurations-list",
-        name: "Configurations List",
-        icon: <ListAltIcon />,
-      },
-      {
-        type: "title",
-        name: "Operator",
-        component: Typography,
-      },
-      {
-        group: "Operator",
-        type: "item",
-        component: NavLink,
-        to: "/clusters",
-        name: "Clusters",
-        icon: <StorageIcon />,
-        forceDisplay: true,
-      },
-      {
-        type: "divider",
-        key: "divider-2",
-      },
-    ];
-
-    const allowedItems = menu.filter(
-      (item: any) =>
-        allowedPages[item.to] || item.forceDisplay || item.type !== "item"
-    );
-
-    return (
-      <React.Fragment>
-        <div className={classes.logo}>
-          <img src={logo} alt="logo" />
-        </div>
-        <List className={classes.menuList}>
-          {allowedItems.map((page: any) => {
-            switch (page.type) {
-              case "divider": {
-                return <Divider key={page.key} />;
-              }
-              case "item": {
-                return (
-                  <ListItem
-                    key={page.to}
-                    button
-                    component={page.component}
-                    to={page.to}
-                  >
-                    {page.icon && <ListItemIcon>{page.icon}</ListItemIcon>}
-                    {page.name && <ListItemText primary={page.name} />}
-                  </ListItem>
-                );
-              }
-              case "title": {
-                return (
-                  (allowedItems || []).filter(
-                    (item: any) => item.group === page.name
-                  ).length > 0 && (
-                    <ListItem key={page.name} component={page.component}>
-                      {page.name}
-                    </ListItem>
-                  )
-                );
-              }
-              default:
-            }
-          })}
-          <ListItem
-            button
-            onClick={() => {
-              this.logout();
-            }}
-          >
-            <ListItemIcon>
-              <ExitToApp />
-            </ListItemIcon>
-            <ListItemText primary="Logout" />
-          </ListItem>
-        </List>
-      </React.Fragment>
-    );
-  }
-}
-
-export default connector(withStyles(styles)(Menu));

portal-ui/src/screens/Console/Menu/Menu.tsx

@@ -0,0 +1,424 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { NavLink } from "react-router-dom";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import WebAssetIcon from "@material-ui/icons/WebAsset";
+import HealingIcon from "@material-ui/icons/Healing";
+import Collapse from "@material-ui/core/Collapse";
+import ListItemText from "@material-ui/core/ListItemText";
+import List from "@material-ui/core/List";
+import { Divider, Typography, withStyles } from "@material-ui/core";
+import { ExitToApp } from "@material-ui/icons";
+import storage from "local-storage-fallback";
+import { createStyles, Theme } from "@material-ui/core/styles";
+import history from "../../../history";
+import logo from "../../../icons/minio_console_logo.svg";
+import { AppState } from "../../../store";
+import { userLoggedIn } from "../../../actions";
+import api from "../../../common/api";
+import WatchIcon from "../../../icons/WatchIcon";
+import { menuGroups } from "./utils";
+import { IMenuProps } from "./types";
+import {
+  BucketsIcon,
+  ClustersIcon,
+  ConfigurationsListIcon,
+  DashboardIcon,
+  GroupsIcon,
+  IAMPoliciesIcon,
+  LambdaNotificationsIcon,
+  MirroringIcon,
+  ServiceAccountsIcon,
+  TraceIcon,
+  UsersIcon,
+  WarpIcon,
+} from "../../../icons";
+
+const styles = (theme: Theme) =>
+  createStyles({
+    logo: {
+      paddingTop: "42px",
+      marginBottom: "20px",
+      textAlign: "center",
+      "& img": {
+        width: "120px",
+      },
+    },
+    menuList: {
+      "& .active": {
+        borderTopLeftRadius: "3px",
+        borderBottomLeftRadius: "3px",
+        color: "#fff",
+        background:
+          "transparent linear-gradient(90deg, #362585 0%, #362585 7%, #281B6F 39%, #1F1661 100%) 0% 0% no-repeat padding-box;",
+        boxShadow: "4px 4px 4px #A5A5A512",
+        fontWeight: 700,
+        "& .MuiSvgIcon-root": {
+          color: "white",
+        },
+        "& .MuiTypography-root": {
+          color: "#fff",
+        },
+      },
+      paddingLeft: "30px",
+      "& .MuiSvgIcon-root": {
+        fontSize: 16,
+        color: "#362585",
+        maxWidth: 14,
+      },
+      "& .MuiListItemIcon-root": {
+        minWidth: "25px",
+      },
+      "& .MuiTypography-root": {
+        fontSize: "12px",
+        color: "#2e2e2e",
+      },
+      "& .MuiListItem-gutters": {
+        paddingRight: 0,
+      },
+    },
+    extraMargin: {
+      "&.MuiListItem-gutters": {
+        marginLeft: 5,
+      },
+    },
+    groupTitle: {
+      color: "#220c7c",
+      fontSize: 10,
+      textTransform: "uppercase",
+      fontWeight: 700,
+      marginBottom: 3,
+      cursor: "pointer",
+      userSelect: "none",
+    },
+    subTitleMenu: {
+      fontWeight: 700,
+      marginLeft: 10,
+      "&.MuiTypography-root": {
+        fontSize: 13,
+        color: "#220c7c",
+      },
+    },
+    selectorArrow: {
+      marginLeft: 3,
+      marginTop: 1,
+      display: "inline-block",
+      width: 0,
+      height: 0,
+      borderStyle: "solid",
+      borderWidth: "3px 2.5px 0 2.5px",
+      borderColor: "#220C7C transparent transparent transparent",
+      transform: "rotateZ(0deg)",
+      transitionDuration: "0.2s",
+    },
+    selectorArrowOpen: {
+      transform: "rotateZ(180deg)",
+    },
+  });
+
+const mapState = (state: AppState) => ({
+  open: state.system.loggedIn,
+});
+
+const connector = connect(mapState, { userLoggedIn });
+
+// Menu State builder for groups
+const menuStateBuilder = () => {
+  let elements: any = [];
+  menuGroups.forEach((menuItem) => {
+    if (menuItem.collapsible) {
+      elements[menuItem.group] = true;
+    }
+  });
+
+  return elements;
+};
+
+const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
+  const [menuOpen, setMenuOpen] = useState<any>(menuStateBuilder());
+
+  const logout = () => {
+    const deleteSession = () => {
+      storage.removeItem("token");
+      userLoggedIn(false);
+      history.push("/");
+    };
+    api
+      .invoke("POST", `/api/v1/logout`)
+      .then(() => {
+        deleteSession();
+      })
+      .catch((err: any) => {
+        console.log(err);
+        deleteSession();
+      });
+  };
+
+  const menuItems = [
+    {
+      group: "common",
+      type: "item",
+      component: NavLink,
+      to: "/dashboard",
+      name: "Dashboard",
+      icon: <DashboardIcon />,
+    },
+    {
+      group: "User",
+      type: "item",
+      component: NavLink,
+      to: "/buckets",
+      name: "Buckets",
+      icon: <BucketsIcon />,
+    },
+    {
+      group: "User",
+      type: "item",
+      component: NavLink,
+      to: "/service-accounts",
+      name: "Service Accounts",
+      icon: <ServiceAccountsIcon />,
+    },
+    {
+      group: "Admin",
+      type: "item",
+      component: NavLink,
+      to: "/users",
+      name: "Users",
+      icon: <UsersIcon />,
+    },
+    {
+      group: "Admin",
+      type: "item",
+      component: NavLink,
+      to: "/groups",
+      name: "Groups",
+      icon: <GroupsIcon />,
+    },
+    {
+      group: "Admin",
+      type: "item",
+      component: NavLink,
+      to: "/policies",
+      name: "IAM Policies",
+      icon: <IAMPoliciesIcon />,
+    },
+    {
+      group: "Tools",
+      type: "item",
+      component: NavLink,
+      to: "/logs",
+      name: "Console Logs",
+      icon: <WebAssetIcon />,
+    },
+    {
+      group: "Tools",
+      type: "item",
+      component: NavLink,
+      to: "/watch",
+      name: "Watch",
+      icon: <WatchIcon />,
+    },
+    {
+      group: "Tools",
+      type: "item",
+      component: NavLink,
+      to: "/trace",
+      name: "Trace",
+      icon: <TraceIcon />,
+    },
+    {
+      group: "Tools",
+      type: "item",
+      component: NavLink,
+      to: "/heal",
+      name: "Heal",
+      icon: <HealingIcon />,
+    },
+    {
+      group: "Admin",
+      type: "title",
+      name: "Configurations",
+      component: Typography,
+    },
+    {
+      group: "Admin",
+      type: "item",
+      component: NavLink,
+      to: "/notification-endpoints",
+      name: "Lambda Notifications",
+      icon: <LambdaNotificationsIcon />,
+      extraMargin: true,
+    },
+    {
+      group: "Admin",
+      type: "item",
+      component: NavLink,
+      to: "/configurations-list",
+      name: "Configurations List",
+      icon: <ConfigurationsListIcon />,
+      extraMargin: true,
+    },
+    {
+      group: "Operator",
+      type: "item",
+      component: NavLink,
+      to: "/tenants",
+      name: "Tenants",
+      icon: <ClustersIcon />,
+    },
+    {
+      group: "Operator",
+      type: "item",
+      component: NavLink,
+      to: "/mirroring",
+      name: "Mirroring",
+      icon: <MirroringIcon />,
+    },
+    {
+      group: "Operator",
+      type: "item",
+      component: NavLink,
+      to: "/warp",
+      name: "Warp",
+      icon: <WarpIcon />,
+    },
+  ];
+
+  const allowedPages = pages.reduce((result: any, item: any, index: any) => {
+    result[item] = true;
+    return result;
+  }, {});
+
+  const allowedItems = menuItems.filter(
+    (item: any) =>
+      allowedPages[item.to] || item.forceDisplay || item.type !== "item"
+  );
+
+  const setMenuCollapse = (menuClicked: string) => {
+    let newMenu: any = { ...menuOpen };
+
+    newMenu[menuClicked] = !newMenu[menuClicked];
+
+    setMenuOpen(newMenu);
+  };
+
+  return (
+    <React.Fragment>
+      <div className={classes.logo}>
+        <img src={logo} alt="logo" />
+      </div>
+      <List className={classes.menuList}>
+        {menuGroups.map((groupMember, index) => {
+          const filterByGroup = (allowedItems || []).filter(
+            (item: any) => item.group === groupMember.group
+          );
+
+          const countableElements = filterByGroup.filter(
+            (menuItem: any) => menuItem.type !== "title"
+          );
+
+          if (countableElements.length == 0) {
+            return null;
+          }
+
+          return (
+            <React.Fragment key={`menuElem-${index.toString()}`}>
+              {groupMember.label !== "" && (
+                <ListItem
+                  className={classes.groupTitle}
+                  onClick={() => {
+                    if (groupMember.collapsible) {
+                      setMenuCollapse(groupMember.group);
+                    }
+                  }}
+                >
+                  {groupMember.label}
+                  {groupMember.collapsible && (
+                    <span
+                      className={`${classes.selectorArrow} ${
+                        menuOpen[groupMember.group]
+                          ? classes.selectorArrowOpen
+                          : ""
+                      }`}
+                    />
+                  )}
+                </ListItem>
+              )}
+              <Collapse
+                in={
+                  groupMember.collapsible ? menuOpen[groupMember.group] : true
+                }
+                timeout="auto"
+                unmountOnExit
+                key={`menuGroup-${groupMember.group}`}
+              >
+                {filterByGroup.map((page: any) => {
+                  switch (page.type) {
+                    case "item": {
+                      return (
+                        <ListItem
+                          key={page.to}
+                          button
+                          component={page.component}
+                          to={page.to}
+                          className={
+                            page.extraMargin ? classes.extraMargin : null
+                          }
+                        >
+                          {page.icon && (
+                            <ListItemIcon>{page.icon}</ListItemIcon>
+                          )}
+                          {page.name && <ListItemText primary={page.name} />}
+                        </ListItem>
+                      );
+                    }
+                    case "title": {
+                      return (
+                        <ListItem
+                          key={page.name}
+                          component={page.component}
+                          className={classes.subTitleMenu}
+                        >
+                          {page.name}
+                        </ListItem>
+                      );
+                    }
+                    default:
+                  }
+                })}
+                <Divider />
+              </Collapse>
+            </React.Fragment>
+          );
+        })}
+
+        <ListItem button onClick={logout}>
+          <ListItemIcon>
+            <ExitToApp />
+          </ListItemIcon>
+          <ListItemText primary="Logout" />
+        </ListItem>
+      </List>
+    </React.Fragment>
+  );
+};
+
+export default connector(withStyles(styles)(Menu));

portal-ui/src/screens/Console/Menu/types.ts

@@ -14,12 +14,10 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-export interface IZone {
-  name: string;
-  servers: number;
-}
+import { userLoggedIn } from "../../../actions";
 
-export interface IVolumeConfiguration {
-  size: string;
-  storage_class: string;
+export interface IMenuProps {
+  classes: any;
+  userLoggedIn: typeof userLoggedIn;
+  pages: string[];
 }

portal-ui/src/screens/Console/Menu/utils.ts

@@ -0,0 +1,23 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+export const menuGroups = [
+  { label: "", group: "common", collapsible: false },
+  { label: "User", group: "User", collapsible: true },
+  { label: "Admin", group: "Admin", collapsible: true },
+  { label: "Tools", group: "Tools", collapsible: true },
+  { label: "Operator", group: "Operator", collapsible: true },
+];

portal-ui/src/screens/Console/Tenants/ListTenants/AddTenant.tsx

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { useState, useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
 import Grid from "@material-ui/core/Grid";
 import Typography from "@material-ui/core/Typography";
@@ -26,11 +26,10 @@ import { modalBasic } from "../../Common/FormComponents/common/styleLibrary";
 import { IVolumeConfiguration, IZone } from "./types";
 import CheckboxWrapper from "../../Common/FormComponents/CheckboxWrapper/CheckboxWrapper";
 import SelectWrapper from "../../Common/FormComponents/SelectWrapper/SelectWrapper";
-import { factorForDropdown, units } from "../../../../common/utils";
+import { k8sfactorForDropdown } from "../../../../common/utils";
 import ZonesMultiSelector from "./ZonesMultiSelector";
-import { storageClasses } from "../utils";
 
-interface IAddClusterProps {
+interface IAddTenantProps {
   open: boolean;
   closeModalAndRefresh: (reloadData: boolean) => any;
   classes: any;
@@ -55,14 +54,14 @@ const styles = (theme: Theme) =>
     ...modalBasic,
   });
 
-const AddCluster = ({
+const AddTenant = ({
   open,
   closeModalAndRefresh,
   classes,
-}: IAddClusterProps) => {
+}: IAddTenantProps) => {
   const [addSending, setAddSending] = useState<boolean>(false);
   const [addError, setAddError] = useState<string>("");
-  const [clusterName, setClusterName] = useState<string>("");
+  const [tenantName, setTenantName] = useState<string>("");
   const [imageName, setImageName] = useState<string>("");
   const [serviceName, setServiceName] = useState<string>("");
   const [zones, setZones] = useState<IZone[]>([]);
@@ -75,13 +74,37 @@ const AddCluster = ({
   const [secretKey, setSecretKey] = useState<string>("");
   const [enableMCS, setEnableMCS] = useState<boolean>(false);
   const [enableSSL, setEnableSSL] = useState<boolean>(false);
-  const [sizeFactor, setSizeFactor] = useState<string>("GiB");
+  const [sizeFactor, setSizeFactor] = useState<string>("Gi");
+  const [storageClasses, setStorageClassesList] = useState<string[]>([]);
+
+  useEffect(() => {
+    fetchStorageClassList();
+  }, []);
 
   useEffect(() => {
     if (addSending) {
+      let cleanZones: IZone[] = [];
+      for (let zone of zones) {
+        if (zone.name !== "") {
+          cleanZones.push(zone);
+        }
+      }
+
       api
-        .invoke("POST", `/api/v1/clusters`, {
-          name: clusterName,
+        .invoke("POST", `/api/v1/mkube/tenants`, {
+          name: tenantName,
+          service_name: tenantName,
+          image: imageName,
+          enable_ssl: enableSSL,
+          enable_mcs: enableMCS,
+          access_key: accessKey,
+          secret_key: secretKey,
+          volumes_per_server: volumesPerServer,
+          volume_configuration: {
+            size: `${volumeConfiguration.size}${sizeFactor}`,
+            storage_class: volumeConfiguration.storage_class,
+          },
+          zones: cleanZones,
         })
         .then(() => {
           setAddSending(false);
@@ -105,9 +128,29 @@ const AddCluster = ({
     setVolumeConfiguration(volumeCopy);
   };
 
+  const fetchStorageClassList = () => {
+    api
+      .invoke("GET", `/api/v1/mkube/storage-classes`)
+      .then((res: string[]) => {
+        let classes: string[] = [];
+        if (res !== null) {
+          classes = res;
+        }
+        setStorageClassesList(classes);
+      })
+      .catch((err: any) => {
+        console.log(err);
+      });
+  };
+
+  const storageClassesList = storageClasses.map((s: string) => ({
+    label: s,
+    value: s,
+  }));
+
   return (
     <ModalWrapper
-      title="Create Cluster"
+      title="Create Tenant"
       modalOpen={open}
       onClose={() => {
         setAddError("");
@@ -139,13 +182,13 @@ const AddCluster = ({
             )}
             <Grid item xs={12}>
               <InputBoxWrapper
-                id="cluster-name"
-                name="cluster-name"
+                id="tenant-name"
+                name="tenant-name"
                 onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setClusterName(e.target.value);
+                  setTenantName(e.target.value);
                 }}
-                label="Cluster Name"
-                value={clusterName}
+                label="Tenant Name"
+                value={tenantName}
               />
             </Grid>
             <Grid item xs={12}>
@@ -155,7 +198,7 @@ const AddCluster = ({
                 onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                   setImageName(e.target.value);
                 }}
-                label="Image"
+                label="MinIO Image"
                 value={imageName}
               />
             </Grid>
@@ -175,7 +218,9 @@ const AddCluster = ({
                 <ZonesMultiSelector
                   label="Zones"
                   name="zones_selector"
-                  onChange={() => {}}
+                  onChange={(elements: IZone[]) => {
+                    setZones(elements);
+                  }}
                   elements={zones}
                 />
               </div>
@@ -220,7 +265,7 @@ const AddCluster = ({
                     onChange={(e: React.ChangeEvent<{ value: unknown }>) => {
                       setSizeFactor(e.target.value as string);
                     }}
-                    options={factorForDropdown()}
+                    options={k8sfactorForDropdown()}
                   />
                 </div>
               </div>
@@ -234,7 +279,7 @@ const AddCluster = ({
                 }}
                 label="Storage Class"
                 value={volumeConfiguration.storage_class}
-                options={storageClasses}
+                options={storageClassesList}
               />
             </Grid>
             <Grid item xs={12}>
@@ -322,4 +367,4 @@ const AddCluster = ({
   );
 };
 
-export default withStyles(styles)(AddCluster);
+export default withStyles(styles)(AddTenant);

portal-ui/src/screens/Console/Tenants/ListTenants/DeleteTenant.tsx

@@ -28,10 +28,10 @@ import Typography from "@material-ui/core/Typography";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import api from "../../../../common/api";
 
-interface IDeleteCluster {
+interface IDeleteTenant {
   classes: any;
   deleteOpen: boolean;
-  selectedCluster: string;
+  selectedTenant: string;
   closeDeleteModalAndRefresh: (refreshList: boolean) => any;
 }
 
@@ -42,27 +42,29 @@ const styles = (theme: Theme) =>
     },
   });
 
-const DeleteCluster = ({
+const DeleteTenant = ({
   classes,
   deleteOpen,
-  selectedCluster,
+  selectedTenant,
   closeDeleteModalAndRefresh,
-}: IDeleteCluster) => {
+}: IDeleteTenant) => {
   const [deleteLoading, setDeleteLoading] = useState(false);
   const [deleteError, setDeleteError] = useState("");
 
   useEffect(() => {
-    api
-      .invoke("DELETE", `/api/v1/clusters/${selectedCluster}`)
-      .then(() => {
-        setDeleteLoading(false);
-        setDeleteError("");
-        closeDeleteModalAndRefresh(true);
-      })
-      .catch((err) => {
-        setDeleteLoading(false);
-        setDeleteError(err);
-      });
+    if (deleteLoading) {
+      api
+        .invoke("DELETE", `/api/v1/mkube/tenants/${selectedTenant}`)
+        .then(() => {
+          setDeleteLoading(false);
+          setDeleteError("");
+          closeDeleteModalAndRefresh(true);
+        })
+        .catch((err) => {
+          setDeleteLoading(false);
+          setDeleteError(err);
+        });
+    }
   }, [deleteLoading]);
 
   const removeRecord = () => {
@@ -79,11 +81,11 @@ const DeleteCluster = ({
       aria-labelledby="alert-dialog-title"
       aria-describedby="alert-dialog-description"
     >
-      <DialogTitle id="alert-dialog-title">Delete Cluster</DialogTitle>
+      <DialogTitle id="alert-dialog-title">Delete Tenant</DialogTitle>
       <DialogContent>
         {deleteLoading && <LinearProgress />}
         <DialogContentText id="alert-dialog-description">
-          Are you sure you want to delete cluster <b>{selectedCluster}</b>?
+          Are you sure you want to delete tenant <b>{selectedTenant}</b>?
           {deleteError !== "" && (
             <React.Fragment>
               <br />
@@ -117,4 +119,4 @@ const DeleteCluster = ({
   );
 };
 
-export default withStyles(styles)(DeleteCluster);
+export default withStyles(styles)(DeleteTenant);

portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import Grid from "@material-ui/core/Grid";
 import Typography from "@material-ui/core/Typography";
 import TextField from "@material-ui/core/TextField";
@@ -24,12 +24,14 @@ import { Button } from "@material-ui/core";
 import { CreateIcon } from "../../../../icons";
 import TableWrapper from "../../Common/TableWrapper/TableWrapper";
 import { MinTablePaginationActions } from "../../../../common/MinTablePaginationActions";
-import AddCluster from "./AddCluster";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import DeleteCluster from "./DeleteCluster";
-import { Link } from "react-router-dom";
+import api from "../../../../common/api";
+import { ITenant, ITenantsResponse } from "./types";
+import { niceBytes } from "../../../../common/utils";
+import DeleteTenant from "./DeleteTenant";
+import AddTenant from "./AddTenant";
 
-interface IClustersList {
+interface ITenantsList {
   classes: any;
 }
 
@@ -77,19 +79,20 @@ const styles = (theme: Theme) =>
     },
   });
 
-const ListClusters = ({ classes }: IClustersList) => {
-  const [createClusterOpen, setCreateClusterOpen] = useState<boolean>(false);
+const ListTenants = ({ classes }: ITenantsList) => {
+  const [createTenantOpen, setCreateTenantOpen] = useState<boolean>(false);
   const [deleteOpen, setDeleteOpen] = useState<boolean>(false);
-  const [selectedCluster, setSelectedCluster] = useState<any>(null);
+  const [selectedTenant, setSelectedTenant] = useState<any>(null);
   const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [filterClusters, setFilterClusters] = useState<string>("");
+  const [filterTenants, setFilterTenants] = useState<string>("");
   const [records, setRecords] = useState<any[]>([]);
   const [offset, setOffset] = useState<number>(0);
-  const [rowsPerPage, setRowsPerPage] = useState<number>(0);
+  const [rowsPerPage, setRowsPerPage] = useState<number>(10);
   const [page, setPage] = useState<number>(0);
+  const [error, setError] = useState<string>("");
 
   const closeAddModalAndRefresh = (reloadData: boolean) => {
-    setCreateClusterOpen(false);
+    setCreateTenantOpen(false);
 
     if (reloadData) {
       setIsLoading(true);
@@ -104,8 +107,8 @@ const ListClusters = ({ classes }: IClustersList) => {
     }
   };
 
-  const confirmDeleteCluster = (cluster: string) => {
-    setSelectedCluster(cluster);
+  const confirmDeleteTenant = (tenant: string) => {
+    setSelectedTenant(tenant);
     setDeleteOpen(true);
   };
 
@@ -122,17 +125,17 @@ const ListClusters = ({ classes }: IClustersList) => {
   };
 
   const tableActions = [
-    { type: "view", to: `/clusters`, sendOnlyId: true },
-    { type: "delete", onClick: confirmDeleteCluster, sendOnlyId: true },
+    { type: "view", to: `/tenants`, sendOnlyId: true },
+    { type: "delete", onClick: confirmDeleteTenant, sendOnlyId: true },
   ];
 
   const filteredRecords = records
     .slice(offset, offset + rowsPerPage)
     .filter((b: any) => {
-      if (filterClusters === "") {
+      if (filterTenants === "") {
         return true;
       } else {
-        if (b.name.indexOf(filterClusters) >= 0) {
+        if (b.name.indexOf(filterTenants) >= 0) {
           return true;
         } else {
           return false;
@@ -140,36 +143,84 @@ const ListClusters = ({ classes }: IClustersList) => {
       }
     });
 
+  useEffect(() => {
+    if (isLoading) {
+      const fetchRecords = () => {
+        const offset = page * rowsPerPage;
+        api
+          .invoke(
+            "GET",
+            `/api/v1/mkube/tenants?offset=${offset}&limit=${rowsPerPage}`
+          )
+          .then((res: ITenantsResponse) => {
+            if (res === null) {
+              setIsLoading(false);
+              return;
+            }
+            let resTenants: ITenant[] = [];
+            if (res.tenants !== null) {
+              resTenants = res.tenants;
+            }
+
+            for (let i = 0; i < resTenants.length; i++) {
+              const total =
+                resTenants[i].volume_count * resTenants[i].volume_size;
+              resTenants[i].capacity = niceBytes(total + "");
+            }
+
+            setRecords(resTenants);
+            setError("");
+            setIsLoading(false);
+
+            // if we get 0 results, and page > 0 , go down 1 page
+            if ((!res.tenants || res.tenants.length === 0) && page > 0) {
+              const newPage = page - 1;
+              setPage(newPage);
+            }
+          })
+          .catch((err) => {
+            setError(err);
+            setIsLoading(false);
+          });
+      };
+      fetchRecords();
+    }
+  }, [isLoading, page, rowsPerPage]);
+
+  useEffect(() => {
+    setIsLoading(true);
+  }, []);
+
   return (
     <React.Fragment>
-      {createClusterOpen && (
-        <AddCluster
-          open={createClusterOpen}
+      {createTenantOpen && (
+        <AddTenant
+          open={createTenantOpen}
           closeModalAndRefresh={closeAddModalAndRefresh}
         />
       )}
       {deleteOpen && (
-        <DeleteCluster
+        <DeleteTenant
           deleteOpen={deleteOpen}
-          selectedCluster={selectedCluster}
+          selectedTenant={selectedTenant}
           closeDeleteModalAndRefresh={closeDeleteModalAndRefresh}
         />
       )}
       <Grid container>
         <Grid item xs={12}>
-          <Typography variant="h6">Clusters</Typography>
+          <Typography variant="h6">Tenants</Typography>
         </Grid>
         <Grid item xs={12}>
           <br />
         </Grid>
         <Grid item xs={12} className={classes.actionsTray}>
           <TextField
-            placeholder="Search Clusters"
+            placeholder="Search Tenants"
             className={classes.searchField}
             id="search-resource"
             label=""
             onChange={(val) => {
-              setFilterClusters(val.target.value);
+              setFilterTenants(val.target.value);
             }}
             InputProps={{
               disableUnderline: true,
@@ -185,14 +236,13 @@ const ListClusters = ({ classes }: IClustersList) => {
             color="primary"
             startIcon={<CreateIcon />}
             onClick={() => {
-              setCreateClusterOpen(true);
+              setCreateTenantOpen(true);
             }}
           >
-            Create Cluster
+            Create Tenant
           </Button>
         </Grid>
         <Grid item xs={12}>
-          REMOVE THIS:: <Link to={"/clusters/demoCluster"}>Test</Link>
           <br />
         </Grid>
         <Grid item xs={12}>
@@ -201,11 +251,12 @@ const ListClusters = ({ classes }: IClustersList) => {
             columns={[
               { label: "Name", elementKey: "name" },
               { label: "Capacity", elementKey: "capacity" },
-              { label: "# of Zones", elementKey: "zones_counter" },
+              { label: "# of Zones", elementKey: "zone_count" },
+              { label: "State", elementKey: "currentState" },
             ]}
             isLoading={isLoading}
             records={filteredRecords}
-            entityName="Clusters"
+            entityName="Tenants"
             idField="name"
             paginatorConfig={{
               rowsPerPageOptions: [5, 10, 25],
@@ -228,4 +279,4 @@ const ListClusters = ({ classes }: IClustersList) => {
   );
 };
 
-export default withStyles(styles)(ListClusters);
+export default withStyles(styles)(ListTenants);

portal-ui/src/screens/Console/Tenants/ListTenants/types.ts

@@ -0,0 +1,41 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+export interface IZone {
+  name: string;
+  servers: number;
+}
+
+export interface IVolumeConfiguration {
+  size: string;
+  storage_class: string;
+}
+
+export interface ITenant {
+  name: string;
+  zone_count: number;
+  currentState: string;
+  instance_count: 4;
+  creation_date: Date;
+  volume_size: number;
+  volume_count: number;
+  // computed
+  capacity: string;
+}
+
+export interface ITenantsResponse {
+  tenants: ITenant[];
+}

portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx

@@ -31,7 +31,7 @@ import AddZoneModal from "./AddZoneModal";
 import AddBucket from "../../Buckets/ListBuckets/AddBucket";
 import ReplicationSetup from "./ReplicationSetup";
 
-interface IClusterDetailsProps {
+interface ITenantDetailsProps {
   classes: any;
   match: any;
 }
@@ -101,7 +101,7 @@ const mainPagination = {
   ActionsComponent: MinTablePaginationActions,
 };
 
-const ClusterDetails = ({ classes, match }: IClusterDetailsProps) => {
+const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
   const [selectedTab, setSelectedTab] = useState<number>(0);
   const [capacity, setCapacity] = useState<number>(0);
   const [externalIDP, setExternalIDP] = useState<boolean>(false);
@@ -156,7 +156,7 @@ const ClusterDetails = ({ classes, match }: IClusterDetailsProps) => {
       <Grid container>
         <Grid item xs={12}>
           <Typography variant="h6">
-            Cluster > {match.params["clusterName"]}
+            Tenant > {match.params["clusterName"]}
           </Typography>
         </Grid>
         <Grid item xs={12}>
@@ -233,7 +233,7 @@ const ClusterDetails = ({ classes, match }: IClusterDetailsProps) => {
             onChange={(_, newValue: number) => {
               setSelectedTab(newValue);
             }}
-            aria-label="cluster-tabs"
+            aria-label="tenant-tabs"
           >
             <Tab label="Zones" />
             <Tab label="Buckets" />
@@ -425,4 +425,4 @@ const ClusterDetails = ({ classes, match }: IClusterDetailsProps) => {
   );
 };
 
-export default withStyles(styles)(ClusterDetails);
+export default withStyles(styles)(TenantDetails);

portal-ui/yarn.lock

@@ -3013,6 +3013,29 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+chart.js@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7"
+  integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw==
+  dependencies:
+    chartjs-color "^2.1.0"
+    moment "^2.10.2"
+
+chartjs-color-string@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
+  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
+  dependencies:
+    color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
+  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
+  dependencies:
+    chartjs-color-string "^0.6.0"
+    color-convert "^1.9.3"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -3243,7 +3266,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.9.0, color-convert@^1.9.1:
+color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -7632,7 +7655,7 @@ lodash.without@~4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
   integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=
 
-"lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.4:
+"lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.4:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -8028,6 +8051,11 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.0, mkdir
   dependencies:
     minimist "^1.2.5"
 
+moment@^2.10.2:
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
+  integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==
+
 moment@^2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
@@ -9959,7 +9987,7 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
-prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -10176,6 +10204,14 @@ react-app-polyfill@^1.0.6:
     regenerator-runtime "^0.13.3"
     whatwg-fetch "^3.0.0"
 
+react-chartjs-2@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-2.9.0.tgz#d054dbdd763fbe9a76296a4ae0752ea549b76d9e"
+  integrity sha512-IYwqUUnQRAJ9SNA978vxulHJTcUFTJk2LDVfbAyk0TnJFZZG7+6U/2flsE4MCw6WCbBjTTypy8T82Ch7XrPtRw==
+  dependencies:
+    lodash "^4.17.4"
+    prop-types "^15.5.8"
+
 react-codemirror2@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.1.0.tgz#b874a275ad4f6f2ee5adb23b550c0f4b8b82776d"

restapi/admin_heal.go

@@ -0,0 +1,378 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package restapi
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/gorilla/websocket"
+	"github.com/minio/minio/pkg/madmin"
+)
+
+// An alias of string to represent the health color code of an object
+type col string
+
+const (
+	colGrey   col = "Grey"
+	colRed    col = "Red"
+	colYellow col = "Yellow"
+	colGreen  col = "Green"
+)
+
+var (
+	hColOrder = []col{colRed, colYellow, colGreen}
+	hColTable = map[int][]int{
+		1: {0, -1, 1},
+		2: {0, 1, 2},
+		3: {1, 2, 3},
+		4: {1, 2, 4},
+		5: {1, 3, 5},
+		6: {2, 4, 6},
+		7: {2, 4, 7},
+		8: {2, 5, 8},
+	}
+)
+
+type healItemStatus struct {
+	Status string `json:"status"`
+	Error  string `json:"error,omitempty"`
+	Type   string `json:"type"`
+	Name   string `json:"name"`
+	Before struct {
+		Color     string                 `json:"color"`
+		Offline   int                    `json:"offline"`
+		Online    int                    `json:"online"`
+		Missing   int                    `json:"missing"`
+		Corrupted int                    `json:"corrupted"`
+		Drives    []madmin.HealDriveInfo `json:"drives"`
+	} `json:"before"`
+	After struct {
+		Color     string                 `json:"color"`
+		Offline   int                    `json:"offline"`
+		Online    int                    `json:"online"`
+		Missing   int                    `json:"missing"`
+		Corrupted int                    `json:"corrupted"`
+		Drives    []madmin.HealDriveInfo `json:"drives"`
+	} `json:"after"`
+	Size int64 `json:"size"`
+}
+
+type healStatus struct {
+	// Total time since heal start in seconds
+	HealDuration float64 `json:"healDuration"`
+
+	// Accumulated statistics of heal result records
+	BytesScanned int64 `json:"bytesScanned"`
+
+	// Counter for objects, and another counter for all kinds of
+	// items
+	ObjectsScanned int64 `json:"objectsScanned"`
+	ItemsScanned   int64 `json:"itemsScanned"`
+
+	// Counters for healed objects and all kinds of healed items
+	ObjectsHealed int64 `json:"objectsHealed"`
+	ItemsHealed   int64 `json:"itemsHealed"`
+
+	ItemsHealthStatus []healItemStatus `json:"itemsHealthStatus"`
+	// Map of health color code to number of objects with that
+	// health color code.
+	HealthBeforeCols map[col]int64 `json:"healthBeforeCols"`
+	HealthAfterCols  map[col]int64 `json:"healthAfterCols"`
+}
+
+type healOptions struct {
+	BucketName string
+	Prefix     string
+	ForceStart bool
+	ForceStop  bool
+	madmin.HealOpts
+}
+
+// startHeal starts healing of the servers based on heal options
+func startHeal(ctx context.Context, conn WSConn, client MinioAdmin, hOpts *healOptions) error {
+	// Initialize heal
+	healStart, _, err := client.heal(ctx, hOpts.BucketName, hOpts.Prefix, hOpts.HealOpts, "", hOpts.ForceStart, hOpts.ForceStop)
+	if err != nil {
+		log.Println("error initializing healing:", err)
+		return err
+	}
+	if hOpts.ForceStop {
+		log.Println("heal stopped successfully")
+		return nil
+	}
+	clientToken := healStart.ClientToken
+	hs := healStatus{
+		HealthBeforeCols: make(map[col]int64),
+		HealthAfterCols:  make(map[col]int64),
+	}
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+		default:
+			_, res, err := client.heal(ctx, hOpts.BucketName, hOpts.Prefix, hOpts.HealOpts, clientToken, hOpts.ForceStart, hOpts.ForceStop)
+			if err != nil {
+				log.Println("error on heal:", err)
+				return err
+			}
+
+			hs.writeStatus(&res, conn)
+
+			if res.Summary == "finished" {
+				log.Println("heal finished")
+				return nil
+			}
+
+			if res.Summary == "stopped" {
+				log.Println("heal stopped")
+				return fmt.Errorf("heal had an error - %s", res.FailureDetail)
+			}
+			time.Sleep(time.Second)
+		}
+	}
+}
+
+func (h *healStatus) writeStatus(s *madmin.HealTaskStatus, conn WSConn) error {
+	// Update state
+	h.updateDuration(s)
+	for _, item := range s.Items {
+		err := h.updateStats(item)
+		if err != nil {
+			fmt.Println("error on updateStats:", err)
+			return err
+		}
+	}
+
+	// Serialize message to be sent
+	infoBytes, err := json.Marshal(h)
+	if err != nil {
+		fmt.Println("error on json.Marshal:", err)
+		return err
+	}
+	// Send Message through websocket connection
+	err = conn.writeMessage(websocket.TextMessage, infoBytes)
+	if err != nil {
+		log.Println("error writeMessage:", err)
+		return err
+	}
+	return nil
+}
+
+func (h *healStatus) updateDuration(s *madmin.HealTaskStatus) {
+	h.HealDuration = time.Now().UTC().Sub(s.StartTime).Round(time.Second).Seconds()
+}
+
+func (h *healStatus) updateStats(i madmin.HealResultItem) error {
+	// update general status
+	if i.Type == madmin.HealItemObject {
+		// Objects whose size could not be found have -1 size
+		// returned.
+		if i.ObjectSize >= 0 {
+			h.BytesScanned += i.ObjectSize
+		}
+		h.ObjectsScanned++
+	}
+	h.ItemsScanned++
+
+	beforeUp, afterUp := i.GetOnlineCounts()
+	if afterUp > beforeUp {
+		if i.Type == madmin.HealItemObject {
+			h.ObjectsHealed++
+		}
+		h.ItemsHealed++
+	}
+	// update per item status
+	itemStatus := healItemStatus{}
+	// get color health status
+	var beforeColor, afterColor col
+	var err error
+	switch i.Type {
+	case madmin.HealItemMetadata, madmin.HealItemBucket:
+		beforeColor, afterColor, err = getReplicatedFileHCCChange(i)
+	default:
+		if i.Type == madmin.HealItemObject {
+			itemStatus.Size = i.ObjectSize
+		}
+		beforeColor, afterColor, err = getObjectHCCChange(i)
+	}
+	if err != nil {
+		return err
+	}
+	itemStatus.Status = "success"
+	itemStatus.Before.Color = strings.ToLower(string(beforeColor))
+	itemStatus.After.Color = strings.ToLower(string(afterColor))
+	itemStatus.Type, itemStatus.Name = getHRITypeAndName(i)
+	itemStatus.Before.Online, itemStatus.After.Online = beforeUp, afterUp
+	itemStatus.Before.Missing, itemStatus.After.Missing = i.GetMissingCounts()
+	itemStatus.Before.Corrupted, itemStatus.After.Corrupted = i.GetCorruptedCounts()
+	itemStatus.Before.Offline, itemStatus.After.Offline = i.GetOfflineCounts()
+	itemStatus.Before.Drives = i.Before.Drives
+	itemStatus.After.Drives = i.After.Drives
+	h.ItemsHealthStatus = append(h.ItemsHealthStatus, itemStatus)
+	h.HealthBeforeCols[beforeColor]++
+	h.HealthAfterCols[afterColor]++
+	return nil
+}
+
+// getObjectHCCChange - returns before and after color change for
+// objects
+func getObjectHCCChange(h madmin.HealResultItem) (b, a col, err error) {
+	parityShards := h.ParityBlocks
+	dataShards := h.DataBlocks
+
+	onlineBefore, onlineAfter := h.GetOnlineCounts()
+	surplusShardsBeforeHeal := onlineBefore - dataShards
+	surplusShardsAfterHeal := onlineAfter - dataShards
+	b, err = getHColCode(surplusShardsBeforeHeal, parityShards)
+	if err != nil {
+		return
+	}
+	a, err = getHColCode(surplusShardsAfterHeal, parityShards)
+	return
+
+}
+
+// getReplicatedFileHCCChange - fetches health color code for metadata
+// files that are replicated.
+func getReplicatedFileHCCChange(h madmin.HealResultItem) (b, a col, err error) {
+	getColCode := func(numAvail int) (c col, err error) {
+		// calculate color code for replicated object similar
+		// to erasure coded objects
+		quorum := h.DiskCount/h.SetCount/2 + 1
+		surplus := numAvail/h.SetCount - quorum
+		parity := h.DiskCount/h.SetCount - quorum
+		c, err = getHColCode(surplus, parity)
+		return
+	}
+
+	onlineBefore, onlineAfter := h.GetOnlineCounts()
+	b, err = getColCode(onlineBefore)
+	if err != nil {
+		return
+	}
+	a, err = getColCode(onlineAfter)
+	return
+}
+
+func getHColCode(surplusShards, parityShards int) (c col, err error) {
+	if parityShards < 1 || parityShards > 8 || surplusShards > parityShards {
+		return c, fmt.Errorf("invalid parity shard count/surplus shard count given")
+	}
+	if surplusShards < 0 {
+		return colGrey, err
+	}
+	colRow := hColTable[parityShards]
+	for index, val := range colRow {
+		if val != -1 && surplusShards <= val {
+			return hColOrder[index], err
+		}
+	}
+	return c, fmt.Errorf("cannot get a heal color code")
+}
+
+func getHRITypeAndName(i madmin.HealResultItem) (typ, name string) {
+	name = fmt.Sprintf("%s/%s", i.Bucket, i.Object)
+	switch i.Type {
+	case madmin.HealItemMetadata:
+		typ = "system"
+		name = i.Detail
+	case madmin.HealItemBucketMetadata:
+		typ = "system"
+		name = "bucket-metadata:" + name
+	case madmin.HealItemBucket:
+		typ = "bucket"
+	case madmin.HealItemObject:
+		typ = "object"
+	default:
+		typ = fmt.Sprintf("!! Unknown heal result record %#v !!", i)
+		name = typ
+	}
+	return
+}
+
+// getHealOptionsFromReq return options from request for healing process
+// path come as : `/heal/bucket1` and query params come on request form
+func getHealOptionsFromReq(req *http.Request) (*healOptions, error) {
+	hOptions := healOptions{}
+	re := regexp.MustCompile(`(/heal/)(.*?)(\?.*?$|$)`)
+	matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
+	// len matches is always 3
+	// matches comes as e.g.
+	// [["...", "/heal/" "bucket1"]]
+	// [["/heal/" "/heal/" ""]]
+
+	// bucket name is on the second group, third position
+	hOptions.BucketName = strings.TrimSpace(string(matches[0][2]))
+	hOptions.Prefix = req.FormValue("prefix")
+	hOptions.HealOpts.ScanMode = transformScanStr(req.FormValue("scan"))
+
+	if req.FormValue("force-start") != "" {
+		boolVal, err := strconv.ParseBool(req.FormValue("force-start"))
+		if err != nil {
+			return nil, err
+		}
+		hOptions.ForceStart = boolVal
+	}
+	if req.FormValue("force-stop") != "" {
+		boolVal, err := strconv.ParseBool(req.FormValue("force-stop"))
+		if err != nil {
+			return nil, err
+		}
+		hOptions.ForceStop = boolVal
+	}
+	// heal recursively
+	if req.FormValue("recursive") != "" {
+		boolVal, err := strconv.ParseBool(req.FormValue("recursive"))
+		if err != nil {
+			return nil, err
+		}
+		hOptions.HealOpts.Recursive = boolVal
+	}
+	// remove dangling objects in heal sequence
+	if req.FormValue("remove") != "" {
+		boolVal, err := strconv.ParseBool(req.FormValue("remove"))
+		if err != nil {
+			return nil, err
+		}
+		hOptions.HealOpts.Remove = boolVal
+	}
+	// only inspect data
+	if req.FormValue("dry-run") != "" {
+		boolVal, err := strconv.ParseBool(req.FormValue("dry-run"))
+		if err != nil {
+			return nil, err
+		}
+		hOptions.HealOpts.DryRun = boolVal
+	}
+	return &hOptions, nil
+}
+
+func transformScanStr(scanStr string) madmin.HealScanMode {
+	switch scanStr {
+	case "deep":
+		return madmin.HealDeepScan
+	}
+	return madmin.HealNormalScan
+}

restapi/admin_heal_test.go

@@ -0,0 +1,278 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package restapi
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/url"
+	"testing"
+	"time"
+
+	"github.com/minio/minio/pkg/madmin"
+	"github.com/stretchr/testify/assert"
+)
+
+// assigning mock at runtime instead of compile time
+var minioHealMock func(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
+	forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error)
+
+func (ac adminClientMock) heal(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
+	forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error) {
+	return minioHealMock(ctx, bucket, prefix, healOpts, clientToken, forceStart, forceStop)
+}
+
+func TestHeal(t *testing.T) {
+	assert := assert.New(t)
+
+	client := adminClientMock{}
+	mockWSConn := mockConn{}
+	ctx := context.Background()
+
+	function := "startHeal()"
+	mockResultItem1 := madmin.HealResultItem{
+		Type:         madmin.HealItemObject,
+		SetCount:     1,
+		DiskCount:    4,
+		ParityBlocks: 2,
+		DataBlocks:   2,
+		Before: struct {
+			Drives []madmin.HealDriveInfo `json:"drives"`
+		}{
+			Drives: []madmin.HealDriveInfo{
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateMissing,
+				},
+			},
+		},
+		After: struct {
+			Drives []madmin.HealDriveInfo `json:"drives"`
+		}{
+			Drives: []madmin.HealDriveInfo{
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+			},
+		},
+	}
+	mockResultItem2 := madmin.HealResultItem{
+		Type:         madmin.HealItemBucket,
+		SetCount:     1,
+		DiskCount:    4,
+		ParityBlocks: 2,
+		DataBlocks:   2,
+		Before: struct {
+			Drives []madmin.HealDriveInfo `json:"drives"`
+		}{
+			Drives: []madmin.HealDriveInfo{
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateMissing,
+				},
+			},
+		},
+		After: struct {
+			Drives []madmin.HealDriveInfo `json:"drives"`
+		}{
+			Drives: []madmin.HealDriveInfo{
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+				{
+					State: madmin.DriveStateOk,
+				},
+			},
+		},
+	}
+	mockHealTaskStatus := madmin.HealTaskStatus{
+		StartTime: time.Now().UTC().Truncate(time.Second * 2), // mock 2 sec duration
+		Items: []madmin.HealResultItem{
+			mockResultItem1,
+			mockResultItem2,
+		},
+		Summary: "finished",
+	}
+
+	testStreamSize := 1
+	testReceiver := make(chan healStatus, testStreamSize)
+	isClosed := false // testReceiver is closed?
+
+	testOptions := &healOptions{
+		BucketName: "testbucket",
+		Prefix:     "",
+		ForceStart: false,
+		ForceStop:  false,
+	}
+	// Test-1: startHeal send simple stream of data, no errors
+	minioHealMock = func(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
+		forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error) {
+
+		return healStart, mockHealTaskStatus, nil
+	}
+	writesCount := 1
+	// mock connection WriteMessage() no error
+	connWriteMessageMock = func(messageType int, data []byte) error {
+		// emulate that receiver gets the message written
+		var t healStatus
+		_ = json.Unmarshal(data, &t)
+		testReceiver <- t
+		if writesCount == testStreamSize {
+			// for testing we need to close the receiver channel
+			if !isClosed {
+				close(testReceiver)
+				isClosed = true
+			}
+			return nil
+		}
+		writesCount++
+		return nil
+	}
+	if err := startHeal(ctx, mockWSConn, client, testOptions); err != nil {
+		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
+	}
+	// check that the TestReceiver got the same number of data from Console.
+	for i := range testReceiver {
+		assert.Equal(int64(1), i.ObjectsScanned)
+		assert.Equal(int64(1), i.ObjectsHealed)
+		assert.Equal(int64(2), i.ItemsScanned)
+		assert.Equal(int64(2), i.ItemsHealed)
+		assert.Equal(int64(0), i.HealthBeforeCols[colGreen])
+		assert.Equal(int64(1), i.HealthBeforeCols[colYellow])
+		assert.Equal(int64(1), i.HealthBeforeCols[colRed])
+		assert.Equal(int64(0), i.HealthBeforeCols[colGrey])
+		assert.Equal(int64(2), i.HealthAfterCols[colGreen])
+		assert.Equal(int64(0), i.HealthAfterCols[colYellow])
+		assert.Equal(int64(0), i.HealthAfterCols[colRed])
+		assert.Equal(int64(0), i.HealthAfterCols[colGrey])
+	}
+
+	// Test-2: startHeal error on init
+	minioHealMock = func(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
+		forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error) {
+		return healStart, mockHealTaskStatus, errors.New("error")
+	}
+
+	if err := startHeal(ctx, mockWSConn, client, testOptions); assert.Error(err) {
+		assert.Equal("error", err.Error())
+	}
+
+	// Test-3: getHealOptionsFromReq return heal options from request
+	u, _ := url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
+	req := &http.Request{
+		URL: u,
+	}
+	opts, err := getHealOptionsFromReq(req)
+	if err != nil {
+		t.Errorf("Failed on %s:, error occurred: %s", "getHealOptionsFromReq", err.Error())
+	}
+	expectedOptions := healOptions{
+		BucketName: "bucket1",
+		ForceStart: true,
+		ForceStop:  true,
+		Prefix:     "file/",
+		HealOpts: madmin.HealOpts{
+			Recursive: true,
+			DryRun:    true,
+			ScanMode:  madmin.HealDeepScan,
+		},
+	}
+	assert.Equal(expectedOptions.BucketName, opts.BucketName)
+	assert.Equal(expectedOptions.Prefix, opts.Prefix)
+	assert.Equal(expectedOptions.Recursive, opts.Recursive)
+	assert.Equal(expectedOptions.ForceStart, opts.ForceStart)
+	assert.Equal(expectedOptions.DryRun, opts.DryRun)
+	assert.Equal(expectedOptions.ScanMode, opts.ScanMode)
+	// Test-3: getHealOptionsFromReq return error if boolean value not valid
+	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=nonbool&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
+	req = &http.Request{
+		URL: u,
+	}
+	opts, err = getHealOptionsFromReq(req)
+	if assert.Error(err) {
+		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
+	}
+	// Test-4: getHealOptionsFromReq return error if boolean value not valid
+	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=nonbool&dry-run=true&scan=deep")
+	req = &http.Request{
+		URL: u,
+	}
+	opts, err = getHealOptionsFromReq(req)
+	if assert.Error(err) {
+		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
+	}
+	// Test-5: getHealOptionsFromReq return error if boolean value not valid
+	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=nonbool&force-stop=true&remove=true&dry-run=true&scan=deep")
+	req = &http.Request{
+		URL: u,
+	}
+	opts, err = getHealOptionsFromReq(req)
+	if assert.Error(err) {
+		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
+	}
+	// Test-6: getHealOptionsFromReq return error if boolean value not valid
+	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=nonbool&remove=true&dry-run=true&scan=deep")
+	req = &http.Request{
+		URL: u,
+	}
+	opts, err = getHealOptionsFromReq(req)
+	if assert.Error(err) {
+		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
+	}
+	// Test-7: getHealOptionsFromReq return error if boolean value not valid
+	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=nonbool&scan=deep")
+	req = &http.Request{
+		URL: u,
+	}
+	opts, err = getHealOptionsFromReq(req)
+	if assert.Error(err) {
+		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
+	}
+}

restapi/client-admin.go

@@ -85,6 +85,8 @@ type MinioAdmin interface {
 	serviceTrace(ctx context.Context, allTrace, errTrace bool) <-chan madmin.ServiceTraceInfo
 	getLogs(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo
 	accountUsageInfo(ctx context.Context) (madmin.AccountUsageInfo, error)
+	heal(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
+		forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error)
 	// Service Accounts
 	addServiceAccount(ctx context.Context, policy *iampolicy.Policy) (mauth.Credentials, error)
 	listServiceAccounts(ctx context.Context) (madmin.ListServiceAccountsResp, error)
@@ -234,6 +236,11 @@ func (ac adminClient) accountUsageInfo(ctx context.Context) (madmin.AccountUsage
 	return ac.client.AccountUsageInfo(ctx)
 }
 
+func (ac adminClient) heal(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
+	forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error) {
+	return ac.client.Heal(ctx, bucket, prefix, healOpts, clientToken, forceStart, forceStop)
+}
+
 func newMAdminClient(jwt string) (*madmin.AdminClient, error) {
 	claims, err := auth.JWTAuthenticate(jwt)
 	if err != nil {
@@ -249,7 +256,9 @@ func newMAdminClient(jwt string) (*madmin.AdminClient, error) {
 // newAdminFromClaims creates a minio admin from Decrypted claims using Assume role credentials
 func newAdminFromClaims(claims *auth.DecryptedClaims) (*madmin.AdminClient, error) {
 	tlsEnabled := getMinIOEndpointIsSecure()
-	adminClient, err := madmin.NewWithOptions(getMinIOEndpoint(), &madmin.Options{
+	endpoint := getMinIOEndpoint()
+
+	adminClient, err := madmin.NewWithOptions(endpoint, &madmin.Options{
 		Creds:  credentials.NewStaticV4(claims.AccessKeyID, claims.SecretAccessKey, claims.SessionToken),
 		Secure: tlsEnabled,
 	})

restapi/config.go

@@ -228,3 +228,8 @@ func getSecureFeaturePolicy() string {
 func getSecureExpectCTHeader() string {
 	return env.Get(McsSecureExpectCTHeader, "")
 }
+
+// getM3Host returns the hostname of mkube
+func getM3Host() string {
+	return env.Get(McsM3Host, "http://m3:8787")
+}

restapi/configure_mcs.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 
 	"github.com/minio/mcs/models"
+	"github.com/minio/mcs/pkg"
 	"github.com/minio/mcs/pkg/auth"
 
 	assetFS "github.com/elazarl/go-bindata-assetfs"
@@ -161,9 +162,13 @@ func setupGlobalMiddleware(handler http.Handler) http.Handler {
 // FileServerMiddleware serves files from the static folder
 func FileServerMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Server", "mcs/"+pkg.Version) // add HTTP Server header
 		switch {
 		case strings.HasPrefix(r.URL.Path, "/ws"):
 			serveWS(w, r)
+		case strings.HasPrefix(r.URL.Path, "/api/v1/mkube"):
+			client := &http.Client{}
+			serverMkube(client, w, r)
 		case strings.HasPrefix(r.URL.Path, "/api"):
 			next.ServeHTTP(w, r)
 		default:

restapi/consts.go

@@ -49,4 +49,5 @@ const (
 	McsSecureReferrerPolicy                  = "MCS_SECURE_REFERRER_POLICY"
 	McsSecureFeaturePolicy                   = "MCS_SECURE_FEATURE_POLICY"
 	McsSecureExpectCTHeader                  = "MCS_SECURE_EXPECT_CT_HEADER"
+	McsM3Host                                = "MCS_M3_HOSTNAME"
 )

restapi/mkube.go

@@ -0,0 +1,68 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package restapi
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"log"
+	"net/http"
+	"strings"
+
+	apiErrors "github.com/go-openapi/errors"
+)
+
+// serverMkube handles calls for mkube
+func serverMkube(client *http.Client, w http.ResponseWriter, req *http.Request) {
+	// destination of the request, the mkube server
+	req.URL.Path = strings.Replace(req.URL.Path, "/mkube", "", 1)
+	targetURL := fmt.Sprintf("%s%s", getM3Host(), req.URL.String())
+
+	// set the HTTP method, url, and m3Req body
+	m3Req, err := http.NewRequest(req.Method, targetURL, req.Body)
+	if err != nil {
+		apiErrors.ServeError(w, req, err)
+		log.Println("error creating m3 request:", err)
+		return
+	}
+
+	// set the m3Req headers
+	m3Req.Header = req.Header
+	resp, err := client.Do(m3Req)
+	if err != nil {
+		log.Println("error on m3 request:", err)
+		if strings.Contains(err.Error(), "connection refused") {
+			apiErrors.ServeError(w, req, errors.New("service M3 is not available"))
+			return
+		}
+		apiErrors.ServeError(w, req, err)
+		return
+	}
+	defer resp.Body.Close()
+	w.Header().Add("Content-Type", resp.Header.Get("Content-Type"))
+	// Write the m3 response to the response writer
+	scanner := bufio.NewScanner(resp.Body)
+	for scanner.Scan() {
+		w.Write(scanner.Bytes())
+	}
+	if err := scanner.Err(); err != nil {
+		log.Println("error scanning m3 response:", err)
+		apiErrors.ServeError(w, req, err)
+	}
+
+}

restapi/mkube_test.go

@@ -0,0 +1,119 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package restapi
+
+import (
+	"bytes"
+	"errors"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+)
+
+// RoundTripFunc .
+type RoundTripFunc func(req *http.Request) (*http.Response, error)
+
+// RoundTrip .
+func (f RoundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
+	return f(req)
+}
+
+//NewTestClient returns *http.Client with Transport replaced to avoid making real calls
+func NewTestClient(fn RoundTripFunc) *http.Client {
+	return &http.Client{
+		Transport: fn,
+	}
+}
+
+func Test_serverMkube(t *testing.T) {
+
+	OKclient := NewTestClient(func(req *http.Request) (*http.Response, error) {
+		return &http.Response{
+			StatusCode: 200,
+			Body:       ioutil.NopCloser(bytes.NewBufferString(`OK`)),
+			Header:     make(http.Header),
+		}, nil
+	})
+
+	badClient := NewTestClient(func(req *http.Request) (*http.Response, error) {
+		return &http.Response{
+			StatusCode: 500,
+			Body:       ioutil.NopCloser(bytes.NewBufferString(`NOTOK`)),
+			Header:     make(http.Header),
+		}, errors.New("something wrong")
+	})
+
+	refusedClient := NewTestClient(func(req *http.Request) (*http.Response, error) {
+		return &http.Response{
+			StatusCode: 500,
+			Body:       ioutil.NopCloser(bytes.NewBufferString(`NOTOK`)),
+			Header:     make(http.Header),
+		}, errors.New("connection refused")
+	})
+
+	testURL, _ := url.Parse("/api/v1/clusters")
+	type args struct {
+		client   *http.Client
+		recorder *httptest.ResponseRecorder
+		req      *http.Request
+	}
+	tests := []struct {
+		name     string
+		args     args
+		wantCode int
+	}{
+		{
+			name: "Successful request",
+			args: args{
+				client:   OKclient,
+				recorder: httptest.NewRecorder(),
+				req:      &http.Request{URL: testURL},
+			},
+			wantCode: 200,
+		},
+		{
+			name: "Unsuccessful request",
+			args: args{
+				client:   badClient,
+				recorder: httptest.NewRecorder(),
+				req:      &http.Request{URL: testURL},
+			},
+			wantCode: 500,
+		},
+		{
+			name: "refused request",
+			args: args{
+				client:   refusedClient,
+				recorder: httptest.NewRecorder(),
+				req:      &http.Request{URL: testURL},
+			},
+			wantCode: 500,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			serverMkube(tt.args.client, tt.args.recorder, tt.args.req)
+			resp := tt.args.recorder.Result()
+			if resp.StatusCode != tt.wantCode {
+				t.Errorf("Invalid code returned")
+				return
+			}
+		})
+	}
+}

restapi/user_session.go

@@ -53,6 +53,7 @@ func getSessionResponse(sessionID string) (*models.SessionResponse, error) {
 		log.Println("error getting claims from JWT", err)
 		return nil, errorGenericInvalidSession
 	}
+
 	sessionResp := &models.SessionResponse{
 		Pages:  acl.GetAuthorizedEndpoints(claims.Actions),
 		Status: models.SessionResponseStatusOk,

restapi/user_watch.go

@@ -78,10 +78,10 @@ func startWatch(ctx context.Context, conn WSConn, wsc MCS3Client, options watchO
 	}
 }
 
-// getOptionsFromReq gets bucket name, events, prefix, suffix from a websocket
+// getWatchOptionsFromReq gets bucket name, events, prefix, suffix from a websocket
 // watch path if defined.
 // path come as : `/watch/bucket1` and query params come on request form
-func getOptionsFromReq(req *http.Request) watchOptions {
+func getWatchOptionsFromReq(req *http.Request) watchOptions {
 	wOptions := watchOptions{}
 	// Default Events if not defined
 	wOptions.Events = []string{"put", "get", "delete"}

restapi/user_watch_test.go

@@ -44,7 +44,7 @@ func TestWatch(t *testing.T) {
 	mockWSConn := mockConn{}
 	ctx := context.Background()
 
-	function := "startWatch(ctx, )"
+	function := "startWatch()"
 
 	testStreamSize := 5
 	testReceiver := make(chan []mc.EventInfo, testStreamSize)
@@ -191,7 +191,7 @@ func TestWatch(t *testing.T) {
 		}
 	}
 
-	// Test-6: getOptionsFromReq return parameters from path
+	// Test-6: getWatchOptionsFromReq return parameters from path
 	u, err := url.Parse("http://localhost/api/v1/watch/bucket1?prefix=&suffix=.jpg&events=put,get")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
@@ -199,7 +199,7 @@ func TestWatch(t *testing.T) {
 	req := &http.Request{
 		URL: u,
 	}
-	opts := getOptionsFromReq(req)
+	opts := getWatchOptionsFromReq(req)
 	expectedOptions := watchOptions{
 		BucketName: "bucket1",
 	}
@@ -211,7 +211,7 @@ func TestWatch(t *testing.T) {
 	assert.Equal(expectedOptions.Suffix, opts.Suffix)
 	assert.Equal(expectedOptions.Events, opts.Events)
 
-	// Test-7: getOptionsFromReq return default events if not defined
+	// Test-7: getWatchOptionsFromReq return default events if not defined
 	u, err = url.Parse("http://localhost/api/v1/watch/bucket1?prefix=&suffix=.jpg&events=")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
@@ -219,7 +219,7 @@ func TestWatch(t *testing.T) {
 	req = &http.Request{
 		URL: u,
 	}
-	opts = getOptionsFromReq(req)
+	opts = getWatchOptionsFromReq(req)
 	expectedOptions = watchOptions{
 		BucketName: "bucket1",
 	}
@@ -231,7 +231,7 @@ func TestWatch(t *testing.T) {
 	assert.Equal(expectedOptions.Suffix, opts.Suffix)
 	assert.Equal(expectedOptions.Events, opts.Events)
 
-	// Test-8: getOptionsFromReq return default events if not defined
+	// Test-8: getWatchOptionsFromReq return default events if not defined
 	u, err = url.Parse("http://localhost/api/v1/watch/bucket2?prefix=&suffix=")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
@@ -239,7 +239,7 @@ func TestWatch(t *testing.T) {
 	req = &http.Request{
 		URL: u,
 	}
-	opts = getOptionsFromReq(req)
+	opts = getWatchOptionsFromReq(req)
 	expectedOptions = watchOptions{
 		BucketName: "bucket2",
 	}

restapi/ws_handle.go

@@ -55,6 +55,7 @@ type wsAdminClient struct {
 // MCSWebsocket interface of a Websocket Client
 type MCSWebsocket interface {
 	watch(options watchOptions)
+	heal(opts healOptions)
 }
 
 type wsS3Client struct {
@@ -125,29 +126,41 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
 	case wsPath == "/trace":
 		wsAdminClient, err := newWebSocketAdminClient(conn, claims)
 		if err != nil {
-			errors.ServeError(w, req, err)
+			closeWsConn(conn)
 			return
 		}
 		go wsAdminClient.trace()
 	case wsPath == "/console":
 		wsAdminClient, err := newWebSocketAdminClient(conn, claims)
 		if err != nil {
-			errors.ServeError(w, req, err)
+			closeWsConn(conn)
 			return
 		}
 		go wsAdminClient.console()
+	case strings.HasPrefix(wsPath, `/heal`):
+		hOptions, err := getHealOptionsFromReq(req)
+		if err != nil {
+			log.Println("error getting heal options:", err)
+			closeWsConn(conn)
+			return
+		}
+		wsAdminClient, err := newWebSocketAdminClient(conn, claims)
+		if err != nil {
+			closeWsConn(conn)
+			return
+		}
+		go wsAdminClient.heal(hOptions)
 	case strings.HasPrefix(wsPath, `/watch`):
-		wOptions := getOptionsFromReq(req)
+		wOptions := getWatchOptionsFromReq(req)
 		wsS3Client, err := newWebSocketS3Client(conn, *sessionID, wOptions.BucketName)
 		if err != nil {
-			errors.ServeError(w, req, err)
+			closeWsConn(conn)
 			return
 		}
 		go wsS3Client.watch(wOptions)
 	default:
 		// path not found
-		conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
-		conn.Close()
+		closeWsConn(conn)
 	}
 }
 
@@ -227,6 +240,12 @@ func wsReadClientCtx(conn WSConn) context.Context {
 	return ctx
 }
 
+// closeWsConn sends Close Message and closes the websocket connection
+func closeWsConn(conn *websocket.Conn) {
+	conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+	conn.Close()
+}
+
 // trace serves madmin.ServiceTraceInfo
 // on a Websocket connection.
 func (wsc *wsAdminClient) trace() {
@@ -240,25 +259,8 @@ func (wsc *wsAdminClient) trace() {
 	ctx := wsReadClientCtx(wsc.conn)
 
 	err := startTraceInfo(ctx, wsc.conn, wsc.client)
-	// Send Connection Close Message indicating the Status Code
-	// see https://tools.ietf.org/html/rfc6455#page-45
-	if err != nil {
-		log.Println("err:", err)
-		// If connection exceeded read deadline send Close
-		// Message Policy Violation code since we don't want
-		// to let the receiver figure out the read deadline.
-		// This is a generic code designed if there is a
-		// need to hide specific details about the policy.
-		if nErr, ok := err.(net.Error); ok && nErr.Timeout() {
-			wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.ClosePolicyViolation, ""))
-			return
-		}
-		// else, internal server error
-		wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseInternalServerErr, err.Error()))
-		return
-	}
-	// normal closure
-	wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+
+	sendWsCloseMessage(wsc.conn, err)
 }
 
 // console serves madmin.GetLogs
@@ -274,24 +276,8 @@ func (wsc *wsAdminClient) console() {
 	ctx := wsReadClientCtx(wsc.conn)
 
 	err := startConsoleLog(ctx, wsc.conn, wsc.client)
-	// Send Connection Close Message indicating the Status Code
-	// see https://tools.ietf.org/html/rfc6455#page-45
-	if err != nil {
-		// If connection exceeded read deadline send Close
-		// Message Policy Violation code since we don't want
-		// to let the receiver figure out the read deadline.
-		// This is a generic code designed if there is a
-		// need to hide specific details about the policy.
-		if nErr, ok := err.(net.Error); ok && nErr.Timeout() {
-			wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.ClosePolicyViolation, ""))
-			return
-		}
-		// else, internal server error
-		wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseInternalServerErr, err.Error()))
-		return
-	}
-	// normal closure
-	wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+
+	sendWsCloseMessage(wsc.conn, err)
 }
 
 func (wsc *wsS3Client) watch(params watchOptions) {
@@ -305,8 +291,28 @@ func (wsc *wsS3Client) watch(params watchOptions) {
 	ctx := wsReadClientCtx(wsc.conn)
 
 	err := startWatch(ctx, wsc.conn, wsc.client, params)
-	// Send Connection Close Message indicating the Status Code
-	// see https://tools.ietf.org/html/rfc6455#page-45
+
+	sendWsCloseMessage(wsc.conn, err)
+}
+
+func (wsc *wsAdminClient) heal(opts *healOptions) {
+	defer func() {
+		log.Println("heal stopped")
+		// close connection after return
+		wsc.conn.close()
+	}()
+	log.Println("heal started")
+
+	ctx := wsReadClientCtx(wsc.conn)
+
+	err := startHeal(ctx, wsc.conn, wsc.client, opts)
+
+	sendWsCloseMessage(wsc.conn, err)
+}
+
+// sendWsCloseMessage sends Websocket Connection Close Message indicating the Status Code
+// see https://tools.ietf.org/html/rfc6455#page-45
+func sendWsCloseMessage(conn WSConn, err error) {
 	if err != nil {
 		// If connection exceeded read deadline send Close
 		// Message Policy Violation code since we don't want
@@ -314,13 +320,13 @@ func (wsc *wsS3Client) watch(params watchOptions) {
 		// This is a generic code designed if there is a
 		// need to hide specific details about the policy.
 		if nErr, ok := err.(net.Error); ok && nErr.Timeout() {
-			wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.ClosePolicyViolation, ""))
+			conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.ClosePolicyViolation, ""))
 			return
 		}
 		// else, internal server error
-		wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseInternalServerErr, err.Error()))
+		conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseInternalServerErr, err.Error()))
 		return
 	}
 	// normal closure
-	wsc.conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+	conn.writeMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
 }