updated instructions and image of adapters

Meshery-Adapters/kuma-meshery-adapter/index.json

@@ -38,11 +38,11 @@
     "hideHiddenFiles": true,
     "exclusionPatterns": ["*test", "./test/*", "./logs"],
     "showdashboard": true,
-    "dashboards": [{"name": "Meshery Server", "port": 9081}],
+    "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Image Hub", "port": 8080}],
     "uilayout": "terminal-iframe"
   }, 
 
   "backend": {
-    "imageid": "kubernetes-cluster-running:1.18"
+    "imageid": "kubernetes-cluster-running:1.22"
   }
 }

Meshery-Adapters/kuma-meshery-adapter/step1.md

@@ -10,20 +10,28 @@ Meshery can be downloaded, installed, and launched with a single command:
 
 `curl -L https://git.io/meshery | ADAPTERS=kuma PLATFORM=kubernetes bash -`{{execute}}
 
-**Congratulations!** You have successfully installed Meshery and the Meshery Adapter for Linkerd.
+**Congratulations!** You have successfully installed Meshery and the Meshery Adapter for Kuma.
 
 Meshery is now available at host:`9081`.
 
-Find the **Meshery UI** tab is configured to be listening at `http://localhost:9081`/
+><font size=2>NOTE: If you see a vim page please press `q` and `y`. Also if you see an error stating `Failed to open Meshery in browser, please point your browser to....` please ignore it. </font>
 
-- Click on the **Meshery UI** tab
-- Click on **Display Port**
+To know that the Meshery has loaded with all the components connected, run 
+
+`mesheryctl system status`{{execute}}.
+
+ If all the components are in ready state you can open Mehsery UI tab with everything connected.
+
+Find the **Meshery UI** tab which is configured to be listening at `http://localhost:9081`/
+
+- Click on new tab icon the **Meshery UI** tab
+- Click on **Display Port** 
 
 **Welcome to Meshery!**
 
 Choose **Meshery** as your provider. Sign in to get started.
 
-![Meshery landing page](./assets/meshery-none-provider.png)
+![Meshery landing page](./assets/starting-page.png)
 
 ## Connect your cluster with Meshery
 
@@ -34,8 +42,6 @@ Meshery will auto-connect with your Kubernetes by loading the kubeconfig found i
 
 1. Between Meshery and Kubernetes.
 
-![Meshery connected with cluster](./assets/cluster-up.png)
-
-1. Between Meshery and the Meshery Adapter for your corresponding service mesh.
+2. Between Meshery and the Meshery Adapter for your corresponding service mesh.
 
-![Meshery connected with adapter](./assets/adapter-up.png)
+![Meshery connected with adapter](./assets/kuma-connected.png)

Meshery-Adapters/kuma-meshery-adapter/step2.md

@@ -1,17 +1,17 @@
 Kuma can be installed on Meshery with one click! 
 
-## 1. Select `Kuma` from the Management menu
+## 1. Select `Kuma` from the Lifecycle menu
 
 ![Meshery adapter for Kuma](./assets/kuma-adapter.png)
 
 ## 2. In the Kuma management page:
 
 - Type `kuma` into the namespace field
-- Click the (+) icon on the Install card and select `Latest Kuma` to install the latest version of Istio
+- Click the (+) icon on the Manage Service Mesh Lifecycle card and select `Kuma Service Mesh` to install the latest version of Kuma
 
 ![Install Kuma using Meshery](./assets/install-kuma.png)
 
-To check if Istio is along with all the pieces that have been deployed, execute the following:
+To check if Kuma is along with all the pieces that have been deployed, execute the following:
 
 `kubectl get all -n kuma-system`{{execute}}
 

Meshery-Adapters/kuma-meshery-adapter/step3.md

@@ -7,20 +7,12 @@ Sample Applications are deployed on top of a service mesh to help you explore an
 ## Deploy Image Hub on Kuma
 
 - Navigate to the **Kuma Management** page on Meshery with `default` in the Namespace field.
-- Select the `Image Hub application` in the `Sample Application` drop down menu.
+- Select the `Image Hub application` in the `Manage Sample Application Life` drop down menu.
 
-![Kuma Imagehub](./assets/kuma-sample-app.png)
+![Kuma Imagehub](./assets/install image-hub.png)
 
 You will be notified of successful deployment.
 
-## Expose your Sample Application
-
-A sidecar injector is used for automating the injection of the Linkerd proxy into your application's pod spec. The Kubernetes admission controller enforces this behavior by sending a webhook request to the sidecar injector every time a pod is to be scheduled.
-
-You have already deployed the sidecar proxy injector when you installed Consul, which should be running in your control plane. To verify, execute this command:
-
-`kubectl get deployment consul-consul-connect-injector-webhook-deployment -n consul-system`{{execute}}
-
 **Let's verify that your deployment works. Run**:
 (The *Available* column might take upto a minute to get updated)
 
@@ -30,9 +22,8 @@ Sample Output:
 
 |        NAME       | READY | UP-TO-DATE | AVAILABLE | AGE |
 |:-----------------:|:-----:|:----------:|:---------:|:---:|
-| api-deployment-v1 |  1/1  |      1     |     1     | 88s |
-|       envoy       |  1/1  |      1     |     1     | 88s |
-|   web-deployment  |  1/1  |      1     |     1     | 88s |
+|       api-v1      |  1/1  |      1     |     1     | 88s |
+|       web-v1      |  1/1  |      1     |     1     | 88s |
 
 ### Let's inspect our pod:
 
@@ -50,10 +41,10 @@ If you cannot see the *Ready* column updated, this is because the deployment can
 
     `kubectl get svc -n default`{{execute}}
 
-    `kubectl describe svc/web-service -n default`{{execute}}
+    `kubectl describe svc/web -n default`{{execute}}
 
 4. Assess the application deployment by port-forwarding the web-service service:
 
-    `kubectl port-forward svc/web-service 8080 --address 0.0.0.0 -n default`{{Execute}}
+    `kubectl port-forward svc/web 8080 --address 0.0.0.0 -n default`{{Execute}}
 
 The Image Hub application should now be deployed on the HTTP port: `8080`. Make your way to the `ImageHub` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:8080`

Meshery-Adapters/linkerd-meshery-adapter/index.json

@@ -37,11 +37,11 @@
     "hideHiddenFiles": true,
     "exclusionPatterns": ["*test", "./test/*", "./logs"],
     "showdashboard": true,
-    "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Emojivoto", "port": 8080}],
+    "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Emojivoto", "port": 80}],
     "uilayout": "terminal-iframe"
   },
 
   "backend": {
-    "imageid": "kubernetes-cluster-running:1.18"
+    "imageid": "kubernetes-cluster-running:1.22"
   }
 }

Meshery-Adapters/linkerd-meshery-adapter/step1.md

@@ -14,18 +14,26 @@ Meshery can be downloaded, installed, and launched with a single command:
 
 Meshery is now available at host:`9081`.
 
+><font size=2>NOTE: If you see a vim page please press `q` and `y`. Also if you see an error stating `Failed to open Meshery in browser, please point your browser to....` please ignore it. </font>
+
+To know that the Meshery has loaded with all the components connected, run 
+
+`mesheryctl system status`{{execute}}.
+
+If all the components are in ready state you can open Mehsery UI tab with everything connected.
+
 ## Open Meshery UI
 
 Find the **Meshery UI** tab is configured to be listening at `http://localhost:9081`/
 
-- Click on the **Meshery UI** tab
+- Click on new tab icon the **Meshery UI** tab
 - Click on **Display Port**
 
 **Welcome to Meshery!**
 
 Choose **Meshery** as your provider. Sign in to get started.
 
-![Meshery landing page](./assets/meshery-none-provider.png)
+![Meshery landing page](./assets/starting-page.png)
 
 ## Connect your cluster with Meshery
 
@@ -36,4 +44,4 @@ Meshery will auto-connect with your Kubernetes by loading the kubeconfig found i
 1. Between Meshery and Kubernetes.
 2. Between Meshery and the Meshery Adapter for your corresponding service mesh.
 
-![Meshery connected with cluster](./assets/cluster-up.png)
+![Meshery connected with cluster](./assets/linkerd-connected.png)

Meshery-Adapters/linkerd-meshery-adapter/step2.md

@@ -1,19 +1,21 @@
 Linkerd can be installed on Meshery with one click! 
 
-## 1. Select `Linkerd` from the Management menu
+## 1. Select `Linkerd` from the Lifecycle menu
 
 ![Meshery adapter for Linkerd](./assets/linkerd-adapter.png)
 
 ## 2. In the Linkerd management page:
 
-- Type `linkerd-system` into the namespace field
-- Click the (+) icon on the Install card and select `Latest Linkerd` to install the latest version of Istio
+- Type `linkerd-system` into the namespace field.
+- Click the (+) icon on the Manage Service Mesh Lifecycle card and select `Linkerd Service Mesh` to install the latest version of Linkerd
 
 ![Install Linkerd using Meshery](./assets/install-linkerd.png)
 
 You can verify the successful installation of Linkerd on your Meshery instance by running:
 `kubectl get all -n linkerd-system`{{execute}}
+You can continue to next step after all the components displayed on the terminal after running this command, are in ready state.
 
 The same can be seen on your Meshery dashboard:
 
-![Linkerd deployed](./assets/linkerd-installed.png)
+![Linkerd deployed](./assets/linkerd-installed.png)
+

Meshery-Adapters/linkerd-meshery-adapter/step3.md

@@ -23,13 +23,13 @@ Upon successful deployment, the output should look like:
 
 To deploy the Emojivoto application, follow these steps:
 
- - Using Meshery, navigate to the Linkerd management page.
+ - Using Meshery, navigate to the Linkerd management page from the Lifecycle menu.
  - Enter `default` in the Namespace field. This is the namespace in which we will be defining and deploying the Sample Application.
- - Click the (+) icon on the Sample Application card and select `Emojivoto Application` from the list.
+ - Click the (+) icon on the Manage Sample Application Lifecycle card and select `EmojiVoto Application` from the list.
 
  ![Emojivoto sample app](./assets/linkerd-sample-app.png)
 
- ![Emojivoto deployed](./assets/emojivoto-deployed.png)
+ ![Emojivoto deployed](./assets/emojivoto-dep.png)
 
 
 **Let's verify that your deployment works. Run**:
@@ -46,12 +46,13 @@ Sample Output:
 |   web    |  1/1  |      1     |     1     | 4m38s |
 
 ### Let's inspect our pod:
+If you cannot see the *Ready* column updated, this is because the deployment can take up upto a minute. When all the deployment are in ready state, you can use `CTRL+ C` to switch back to the terminal.
 
 1. View the details of the deployed pods:
 
     `watch kubectl get po -n default`{{execute}} 
 
-If you cannot see the *Ready* column updated, this is because the deployment can take up upto a minute. When the deployment is complete, the page will auto-refresh. You can use `CTRL+ C` to switch back to the terminal.
+Again if you cannot see the *Ready* column updated, this is because the deployment can take up upto a minute. When the deployment is complete, the page will auto-refresh. You can use `CTRL+ C` to switch back to the terminal.
 
 2. View the details of the services:
 
@@ -68,11 +69,11 @@ If you cannot see the *Ready* column updated, this is because the deployment can
     `kubectl port-forward svc/web-svc 80:80 --address 0.0.0.0 -n default`{{Execute}}
 
 **Success!**
-The `emojivoto` sample application has now been onboarded on to your Linkerd instance. As a final check, let's verify your data plane environment with this check:
+The `emojivoto` sample application has now been onboarded on to your Linkerd instance. This may take some time. As a final check, let's verify your data plane environment with this check:
 
 `linkerd -n emojivoto check --proxy`{{execute}}
 
-The Emojivoto sample application should now be deployed at HTTP port:`8080`. Make your way to the `Linkerd-Emojivoto` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:8080`
+The Emojivoto sample application should now be deployed at HTTP port:`80`. Make your way to the `Emojivoto` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:80`
 
 **Note**: The Sample Application may take upto a minute to deploy. Please be patient
 

Meshery-Adapters/nsm-meshery-adapter/index.json

@@ -37,10 +37,10 @@
     "hideHiddenFiles": true,
     "exclusionPatterns": ["*test", "./test/*", "./logs"],
     "showdashboard": true,
-    "dashboards": [{"name": "Meshery Server", "port": 9081},{"name": "ICMP", "port": 8080}],
+    "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "ICMP", "port": 8080}],
     "uilayout": "terminal-iframe"
   },
   "backend": {
-    "imageid": "kubernetes-cluster-running:1.18"
+    "imageid": "kubernetes-cluster-running:1.22"
   }
 }

Meshery-Adapters/nsm-meshery-adapter/step1.md

@@ -10,20 +10,28 @@ Meshery can be downloaded, installed, and launched with a single command:
 
 `curl -L https://git.io/meshery | ADAPTERS=nsm PLATFORM=kubernetes bash -`{{execute}}
 
-**Congratulations!** You have successfully installed Meshery and the Meshery Adapter for Linkerd.
+**Congratulations!** You have successfully installed Meshery and the Meshery Adapter for NSM.
 
 Meshery is now available at host:`9081`.
 
+><font size=2>NOTE: If you see a vim page please press `q` and `y`. Also if you see an error stating `Failed to open Meshery in browser, please point your browser to....` please ignore it. </font>
+
+To know that the Meshery has loaded with all the components connected, run 
+
+`mesheryctl system status`{{execute}}.
+
+If all the components are in ready state you can open Mehsery UI tab with everything connected.
+
 Find the **Meshery UI** tab is configured to be listening at `http://localhost:9081`/
 
-- Click on the **Meshery UI** tab
+- Click on new tab icon the **Meshery UI** tab
 - Click on **Display Port**
 
 **Welcome to Meshery!**
 
 Choose **Meshery** as your provider. Sign in to get started.
 
-![Meshery landing page](./assets/meshery-none-provider.png)
+![Meshery landing page](./assets/starting-page.png)
 
 ## Connect your cluster with Meshery
 
@@ -34,4 +42,4 @@ Meshery will auto-connect with your Kubernetes by loading the kubeconfig found i
 1. Between Meshery and Kubernetes.
 2. Between Meshery and the Meshery Adapter for your corresponding service mesh.
 
-![Meshery connected with cluster](./assets/cluster-up.png)
+![Meshery connected with cluster](./assets/nsm-connected.png)

Meshery-Adapters/nsm-meshery-adapter/step2.md

@@ -4,10 +4,10 @@ Meshery allows you to install any service mesh with a single click:
 
 ![Meshery adapter for NSM](./assets/nsm-adapter.png)
 
-## 2. In the Istio management page:
+## 2. In the NSM management page:
 
 - Type `nsm-system` into the namespace field
-- Click the (+) icon on the Install card and select `Network Service Mesh` to install the latest version of Istio
+- Click the (+) icon on the Manage Service Mesh Lifecycle card and select `NSM` to install the latest version of NSM
 
 ![Install NSM using Meshery](./assets/install-nsm.png)
 
@@ -16,7 +16,9 @@ Meshery allows you to install any service mesh with a single click:
 NSM has been deployed in a separate Kubernetes namespace: nsm-system. To check if NSM is along with all the pieces that have been deployed, execute the following:
 
 `kubectl get all -n nsm-system`{{execute}}
+You can continue to next step after all the components displayed on the terminal after running this command, are in ready state.
 
 The details of your configuration will also be reflected on the Meshery dashboard:
 
+
 ![NSM installed](./assets/nsm-installed.png) 

Meshery-Adapters/nsm-meshery-adapter/step3.md

@@ -8,20 +8,20 @@ Sample Applications are deployed on top of a service mesh to help you explore an
 
 ## Deploy ICMP Application on Kuma
 
-- Navigate to the **NSM Management** page on Meshery with `default` in the Namespace field.
-- Select the `ICMP` in the `Sample Application` drop down menu.
+- Navigate to the **NSM Management** page from the Lifecycle Menu on Meshery and select `default` in the Namespace field.
+- Select the `ICMP Responded` in the Manage Sample Application Lifecycle drop down menu.
 
 ![NSM Sample Apps](./assets/nsm-sample-app.png)
 
 You will be notified of successful deployment:
 
-![NSM ICMP](./assets/icmp-deployed.png)
+![NSM ICMP](./assets/icmp-instaled.png)
 
 ## Expose your Sample Application
 
 A sidecar injector is used for automating the injection of the NSM proxy into your application's pod spec. The Kubernetes admission controller enforces this behavior by sending a webhook request to the sidecar injector every time a pod is to be scheduled.
 
-You have already deployed the sidecar proxy injector when you installedsz Consul, which should be running in your control plane. To verify, execute this command:
+You have already deployed the sidecar proxy injector when you installed NSM, which should be running in your control plane. To verify, execute this command:
 
 `kubectl get deployment nsm-admission-webhook -n nsm-system`{{execute}}
 
@@ -59,4 +59,4 @@ If you cannot see the *Ready* column updated, this is because the deployment can
 
     `kubectl port-forward svc/nsm-admission-webhook 8080 --address 0.0.0.0 -n default`{{Execute}}
 
-The Image Hub application should now be deployed on the HTTP port: `8080`. Make your way to the `ImageHub` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:8080`
+The ICMP application should now be deployed on the HTTP port: `8080`. Make your way to the `ImageHub` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:8080`

Meshery-Adapters/osm-meshery-adapter/index.json

@@ -36,11 +36,11 @@
       "hideHiddenFiles": true,
       "exclusionPatterns": ["*test", "./test/*", "./logs"],
       "showdashboard": true,
-      "dashboards": [{"name": "Meshery Server", "port": 9081},{"name": "Image Hub", "port": 8080}],
+      "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Image Hub", "port": 8080}],
       "uilayout": "terminal-iframe"
     },
 
     "backend": {
-      "imageid": "kubernetes-cluster-running:1.18"
+      "imageid": "kubernetes-cluster-running:1.22"
     }
   }