Merge branch 'master' into dev-uddeshya

.github/workflows/release-drafter.yml

@@ -11,8 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
+      - name: Drafting release
+        id: release_drafter
+        uses: release-drafter/release-drafter@v5
         with:
           config-name: release-drafter.yml
         env:
-          GITHUB_TOKEN: ${{ secrets.RELEASEDRAFTER_PAT }}
+          GITHUB_TOKEN: ${{ secrets.RELEASEDRAFTER_PAT }}
+      - name: Write release to file
+        run: |
+          CONTENT=${{ steps.release_drafter.outputs.body }}
+          TAG=${{ steps.release_drafter.outputs.tag_name }}
+          prinf '%b\n' "---\nlayout: default\n---\n\n${CONTENT}" > ./docs/_releases/${TAG}.md

docs/_adapters/app-mesh.md

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: App Mesh
+title: Meshery Adapter for App Mesh
 name: Meshery Adapter for App Mesh
 mesh_name: App Mesh
 version: v0.1.0
@@ -13,7 +13,7 @@ permalink: service-meshes/adapters/app-mesh
 
 {% include adapter-status.html %}
 
-The {{ page.name }} is currently under construction ({{ page.project_status }} state), which means that the adapter is not functional and cannot be interacted with through the <a href="/docs/installation#6-you-will-now-be-directed-to-the-meshery-ui"> Meshery UI </a>at the moment. Check back here to see updates.
+The {{ page.name }} is currently under construction ({{ page.project_status }} state), which means that the adapter is not functional and cannot be interacted with through the <a href="{{ site.baseurl }}/installation#6-you-will-now-be-directed-to-the-meshery-ui"> Meshery UI </a>at the moment. Check back here to see updates.
 
 Want to contribute? Check our [progress](page.github_link).
 

docs/_adapters/consul/consul.md

@@ -1,18 +1,21 @@
 ---
 layout: default
-title: Consul
+title: Meshery Adapter for Consul
 name: Meshery Adapter for Consul
 mesh_name: Consul
 version: v1.8.2
 port: 10002/tcp
 project_status: stable
+lab: consul-meshery-adapter
 github_link: https://github.com/layer5io/meshery-consul
 image: /assets/img/service-meshes/consul.svg
 #redirect_from: service-meshes/adapters/consul
 permalink: service-meshes/adapters/consul
 ---
 {% include adapter-status.html %}
 
+{% include adapter-labs.html %}
+
 ## Lifecycle management
 
 The {{page.name}} can install **{{page.version}}** of the {{page.mesh_name}} service mesh. 
@@ -46,11 +49,11 @@ A number of [sample applications](#sample-applications) for {{page.mesh_name}} c
 
 Meshery supports the deployment of a variety of sample applications on {{ page.name }}. Use Meshery to deploy any of these sample applications.
 
-- [httpbin](/docs/guides/sample-apps#httpbin)
+- [httpbin]({{ site.baseurl }}/guides/sample-apps#httpbin)
     - Httpbin is a simple HTTP request and response service.
-- [Bookinfo](/docs/guides/sample-apps#bookinfo) 
+- [Bookinfo]({{ site.baseurl }}/guides/sample-apps#bookinfo) 
     - The sample BookInfo application displays information about a book, similar to a single catalog entry of an online book store.
-- [Image Hub](/docs/guides/sample-apps/imagehub)
+- [Image Hub]({{ site.baseurl }}/guides/sample-apps/imagehub)
     - Image Hub is a sample application written to run on Consul for exploring WebAssembly modules used as Envoy filters.
 
 [![Layer5 Image Hub on HashiCorp Consul]({{ site.baseurl }}/service-meshes/adapters/consul/layer5-image-hub-on-hashicorp-consul.png)]({{ site.baseurl }}/service-meshes/adapters/consul/layer5-image-hub-on-hashicorp-consul.png)

docs/_adapters/cpx.md

@@ -38,11 +38,11 @@ The {{page.name}} can install **{{page.version}}** of the {{page.mesh_name}}.
 
 The {{ page.name }} includes a handful of sample applications. Some of these applications are from other service meshes and some of these sample applications are general-purpose examples. Use Meshery to deploy any of these sample applications.
 
-- [Bookinfo](/docs/guides/sample-apps#bookinfo)
+- [Bookinfo]({{ site.baseurl }}/guides/sample-apps#bookinfo)
     - Follow this [tutorial workshop](https://github.com/layer5io/istio-service-mesh-workshop/blob/master/lab-2/README.md) to set up and deploy the BookInfo sample app on Istio using Meshery. 
-- [Httpbin](/docs/guides/sample-apps#httpbin)
+- [Httpbin]({{ site.baseurl }}/guides/sample-apps#httpbin)
     - Httpbin is a simple HTTP request and response service.
-- [Hipster](/docs/guides/sample-apps#hipster)
+- [Hipster]({{ site.baseurl }}/guides/sample-apps#hipster)
     - Hipster Shop Application is a web-based, e-commerce demo application from the Google Cloud Platform.
 
 ### Suggested Topics

docs/_adapters/istio/istio.md

@@ -1,17 +1,21 @@
 ---
 layout: default
-title: Istio
+title: Meshery Adapter for Istio
 name: Meshery Adapter for Istio
-version: v1.7.3
+version: v1.8.1
 mesh_name: Istio
 port: 10000/tcp
 project_status: stable
+lab: istio-meshery-adapter
 github_link: https://github.com/layer5io/meshery-istio
 image: /assets/img/service-meshes/istio.svg
 permalink: service-meshes/adapters/istio
 ---
 
 {% include adapter-status.html %}
+
+{% include adapter-labs.html %}
+
 ## Features
 
 1. {{page.mesh_name}} Lifecycle Management
@@ -46,13 +50,13 @@ Click on (+) and choose the {{page.version}} of the {{page.mesh_name}} service m
 
 The ({{page.name}}) includes a handful of sample applications. Use Meshery to deploy any of these sample applications:
 
-- [Bookinfo](/docs/guides/sample-apps#bookinfo)
+- [Bookinfo]({{ site.baseurl }}/guides/sample-apps#bookinfo)
    - Follow this [tutorial workshop](https://github.com/layer5io/istio-service-mesh-workshop/blob/master/lab-2/README.md) to set up and deploy the BookInfo sample app on Istio using Meshery.
 
-- [Httpbin](/docs/guides/sample-apps#httpbin)
+- [Httpbin]({{ site.baseurl }}/guides/sample-apps#httpbin)
     - Httpbin is a simple HTTP request and response service.
 
-- [Hipster](/docs/guides/sample-apps#hipster)
+- [Hipster]({{ site.baseurl }}/guides/sample-apps#hipster)
     - Hipster Shop Application is a web-based, e-commerce demo application from the Google Cloud Platform.
 
 ## Using Service Mesh Standards
@@ -61,7 +65,7 @@ The ({{page.name}}) includes a handful of sample applications. Use Meshery to de
 
 Meshery allows you to analyze the compliance status and functional capabilities of your service mesh. This allows you to compare high-level functional differences between service meshes and verify whether your service mesh is conformant with the SMI specification.
 
-Learn more about the SMI specification and [Meshery's conformance test suite](https://docs.meshery.io/functionality/smi-conformance).
+Learn more about the SMI specification and [Meshery's conformance test suite]({{ site.baseurl }}/functionality/service-mesh-interface).
 
 ### Managing Service Mesh Performance (SMP)
 

docs/_adapters/kuma/kuma.md

@@ -6,13 +6,16 @@ mesh_name: Kuma
 version: v1.0
 port: 10007/tcp
 project_status: beta
+lab: kuma-meshery-adapter
 github_link: https://github.com/layer5io/meshery-kuma
 image: /assets/img/service-meshes/kuma.svg
 permalink: service-meshes/adapters/kuma
 ---
 
 {% include adapter-status.html %}
 
+{% include adapter-labs.html %}
+
 ## Lifecycle management
 
 The {{page.name}} can install **{{page.version}}** of {{page.mesh_name}}. A number of sample applications can be installed using the {{page.name}}.
@@ -35,12 +38,12 @@ Click on (+) and choose the {{page.version}} of the {{page.mesh_name}} service m
 
 The following sample applications are available in this adapter.
 
-- [Bookinfo](/docs/guides/sample-apps#bookinfo) 
+- [Bookinfo]({{ site.baseurl }}/guides/sample-apps#bookinfo) 
     - The sample BookInfo application displays information about a book, similar to a single catalog entry of an online book store.
 
 ### SMI Conformance Capability
 
 Meshery allows you to analyze the compliance status and functional capabilities of your service mesh. This allows you to compare high-level functional differences between service meshes and verify whether your service mesh is conformant with the SMI specification.
 
-Learn more about the SMI specification and [Meshery's conformance test suite](https://docs.meshery.io/functionality/smi-conformance).
+Learn more about the SMI specification and [Meshery's conformance test suite]({{ site.baseurl }}/functionality/service-mesh-interface).
 

docs/_adapters/linkerd.md

@@ -1,16 +1,20 @@
 ---
 layout: default
-title: Linkerd
+title: Meshery Adapter for Linkerd
 name: Meshery Adapter for Linkerd
 mesh_name: Linkerd
 version: v2.5.0
 port: 10001/tcp
 project_status: stable
+lab: linkerd-meshery-adapter
 github_link: https://github.com/layer5io/meshery-linkerd
 image: /assets/img/service-meshes/linkerd.svg
 permalink: service-meshes/adapters/linkerd
 ---
 {% include adapter-status.html %}
+
+{% include adapter-labs.html %}
+
 ### Features
 1. Lifecycle management of {{page.mesh_name}}
 1. Lifecycle management of sample applications
@@ -41,16 +45,16 @@ Note: Linkerd's control plane will be deployed to the `linkerd` namespace. Linke
 
 The {{ page.name }} includes the ability to deploy a variety of sample applications. Use Meshery to deploy any of these sample applications:
 
-- [Emojivoto](/docs/guides/sample-apps#emoji.voto)
+- [Emojivoto]({{ site.baseurl }}/guides/sample-apps#emoji.voto)
     - A microservice application that allows users to vote for their favorite emoji, and tracks votes received on a leaderboard.
 
-- [Bookinfo](/docs/guides/sample-apps#bookinfo) 
+- [Bookinfo]({{ site.baseurl }}/guides/sample-apps#bookinfo) 
     - The sample BookInfo application displays information about a book, similar to a single catalog entry of an online book store.
 
-- [Linkerd Books](/docs/guides/sample-apps#linkerdbooks)
+- [Linkerd Books]({{ site.baseurl }}/guides/sample-apps#linkerdbooks)
     - A sample application built for demonstrating  manage your bookshelf.
 
-- [HTTPbin](/docs/guides/sample-apps#httpbin)
+- [HTTPbin]({{ site.baseurl }}/guides/sample-apps#httpbin)
     - A simple HTTP Request & Response Service.
 
 Identify overhead involved in running {{page.mesh_name}}, various {{page.mesh_name}} configurations while running different workloads and on different infrastructure. The adapter facilitates data plane and control plane performance testing.

docs/_adapters/maesh.md

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Traefik Mesh
+title: Meshery Adapter for Traefik Mesh
 name: Meshery Adapter for Traefik Mesh
 mesh_name: Traefik Mesh
 version: v1.0
@@ -16,18 +16,18 @@ permalink: service-meshes/adapters/maesh
 
 The {{page.name}} can install **{{page.version}}** of {{page.mesh_name}}. A number of sample applications can be installed using the {{page.name}}.
 
-The {{ page.name }} is currently under construction ({{ page.project_status }} state), which means that the adapter is not functional and cannot be interacted with through the <a href="/docs/installation#6-you-will-now-be-directed-to-the-meshery-ui"> Meshery UI </a>at the moment. Check back here to see updates.
+The {{ page.name }} is currently under construction ({{ page.project_status }} state), which means that the adapter is not functional and cannot be interacted with through the <a href="{{ site.baseurl }}installation#6-you-will-now-be-directed-to-the-meshery-ui"> Meshery UI </a>at the moment. Check back here to see updates.
 
 Want to contribute? Check our [progress](page.github_link).
 
 ### Sample Applications
 
 The {{ page.name }} includes some sample applications operations. Meshery can be used to deploy any of these sample applications.  
 
-- [Bookinfo](/docs/guides/sample-apps#bookinfo)
+- [Bookinfo]({{ site.baseurl }}/guides/sample-apps#bookinfo)
     - Follow this [tutorial workshop](https://github.com/layer5io/istio-service-mesh-workshop/blob/master/lab-2/README.md) to set up and deploy the BookInfo sample app on Istio using Meshery. 
 
-- [Httpbin](/docs/guides/sample-apps#httpbin)
+- [Httpbin]({{ site.baseurl }}/guides/sample-apps#httpbin)
     - Httpbin is a simple HTTP request and response service.
 
 

docs/_adapters/nginx-sm.md

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: NGINX Service Mesh
+title: Meshery Adapter for NGINX Service Mesh
 name: Meshery Adapter for NGINX Service Mesh
 mesh_name: NGINX Service Mesh
 version: v0.6.0
@@ -27,13 +27,13 @@ The {{page.name}} can install **{{page.version}}** of {{page.mesh_name}}. A numb
 
 The {{ page.name }} includes a handful of sample applications. Use Meshery to deploy any of these sample applications.
 
-- [Emojivoto](/docs/guides/sample-apps#emoji.voto)
+- [Emojivoto]({{ site.baseurl }}/guides/sample-apps#emoji.voto)
     - A microservice application that allows users to vote for their favorite emoji, and tracks votes received on a leaderboard.
 
-- [Bookinfo](/docs/guides/sample-apps#bookinfo)
+- [Bookinfo]({{ site.baseurl }}/guides/sample-apps#bookinfo)
     - Follow this [tutorial workshop](https://github.com/layer5io/istio-service-mesh-workshop/blob/master/lab-2/README.md) to set up and deploy the BookInfo sample app on Istio using Meshery. 
 
-- [Httpbin](/docs/guides/sample-apps#httpbin)
+- [Httpbin]({{ site.baseurl }}/guides/sample-apps#httpbin)
     - Httpbin is a simple HTTP request and response service.
 
 - [Nginx Servce Mesh Books](https://github.com/BuoyantIO/booksapp)

docs/_adapters/nsm/nsm.md

@@ -1,18 +1,21 @@
 ---
 layout: default
-title: Network Service Mesh
+title: Meshery Adapter for Network Service Mesh
 name: Meshery Adapter for Network Service Mesh
 mesh_name: Network Service Mesh
 version: v0.2.1
 port: 10004/tcp
 project_status: stable
+lab: nsm-meshery-adapter
 github_link: https://github.com/layer5io/meshery-nsm
 image: /assets/img/service-meshes/nsm.svg
 permalink: service-meshes/adapters/nsm
 ---
 
 {% include adapter-status.html %}
 
+{% include adapter-labs.html %}
+
 ## Lifecycle management of {{ page.name }}
 
 The {{page.name}} can install {{page.version}} of {{page.mesh_name}}. A number of sample applications can be installed using the {{page.name}}.

docs/_adapters/octarine/octarine.md

@@ -72,7 +72,7 @@ Once the Octarine's data plane services are deployed, the adapter can be used to
 
 The {{ page.name }} includes the below sample application operation. Meshery can be use to deploy this sample application.
 
-- [Bookinfo](/docs/guides/sample-apps#bookinfo) 
+- [Bookinfo]({{ site.baseurl }}/guides/sample-apps#bookinfo) 
     - The sample BookInfo application displays information about a book, similar to a single catalog entry of an online book store.
 
 ### Suggested Topics

docs/_adapters/osm/osm.md

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Open Service Mesh
+title: Meshery Adapter for Open Service Mesh
 name: Meshery Adapter for Open Service Mesh
 mesh_name: Open Service Mesh
 version: OSM v0.5.0
@@ -37,7 +37,7 @@ Click on (+) and choose the `{{page.version}}` of the {{page.mesh_name}} service
 
 Meshery allows you to analyze the compliance status and functional capabilities of your service mesh. This allows you to compare high-level functional differences between service meshes and verify whether your service mesh is conformant with the SMI specification.
 
-Learn more about the SMI specification and [Meshery's conformance test suite](https://docs.meshery.io/functionality/smi-conformance).
+Learn more about the SMI specification and [Meshery's conformance test suite]({{ site.baseurl }}/functionality/service-mesh-interface).
 ### Managing Service Mesh Performance (SMP)
 
 ### Prometheus and Grafana connections

docs/_adapters/tanzu-sm.md

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Tanzu Service Mesh
+title: Meshery Adapter for Tanzu Service Mesh
 name: Meshery Adapter for Tanzu Service Mesh
 mesh_name: Tanzu Service Mesh
 version: pre-GA
@@ -27,7 +27,7 @@ permalink: service-meshes/adapters/tanzu-sm
 
 The {{page.name}} can install **{{page.version}}** of {{page.mesh_name}}. A number of sample applications for {{page.mesh_name}} can also be installed using Meshery.
 
-The {{ page.name }} is currently under construction ({{ page.project_status }} state), which means that the adapter is not functional and cannot be interacted with through the <a href="/docs/installation#6-you-will-now-be-directed-to-the-meshery-ui"> Meshery UI </a>at the moment. Check back here to see updates.
+The {{ page.name }} is currently under construction ({{ page.project_status }} state), which means that the adapter is not functional and cannot be interacted with through the <a href="{{ site.baseurl }}/installation#6-you-will-now-be-directed-to-the-meshery-ui"> Meshery UI </a>at the moment. Check back here to see updates.
 
 Want to contribute? Check our [progress](page.github_link).
 ## Workload Management

docs/_config.yml

@@ -90,6 +90,8 @@ collections:
   es:
     output: true
     permalink: /:collection/:path
+  releases:
+    output: true
 
 # Defaults
 defaults:

docs/_data/toc.yml

@@ -97,9 +97,9 @@
     - title: "Service Mesh Adapters"
       url: extensibility/adapters
     - title: "Load Generators"
-      url: extensibililty/load-generators
+      url: extensibility/load-generators
     - title: "Providers"
-      url: extensibililty/providers
+      url: extensibility/providers
 - title: Reference
   url: reference
   links:

docs/_includes/adapter-labs.html

@@ -0,0 +1,16 @@
+### Try out the {{page.title}}
+
+Try Meshery using a real environment right in your browser with an interactive lab. The interactive labs help you get started and learn how to run Meshery and {{page.mesh_name}} in production.
+
+<div id="katacoda-scenario"
+        data-katacoda-id="layer5/courses/meshery-adapters/{{page.lab}}"
+        data-katacoda-startscenariobuttontext="Start Scenario"
+        data-katacoda-ctaurl="https://meshery.io"
+        data-katacoda-color="#3C494F"
+        data-katacoda-secondary="#00b39f"
+        data-katacoda-background="#fff"
+        data-katacoda-hideprogress="true"
+        data-katacoda-font="Open Sans"
+        data-katacoda-fontheader="Open Sans" style="height:500px;">
+      </div>
+<script src="https://katacoda.com/embed.js"></script>

docs/_includes/breadcrumbs.html

@@ -1,11 +1,11 @@
 <div id="breadcrumbs">
 {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
-<a href="/docs/">home</a>
+<a href="{{ site.baseurl }}/">home</a>
 {% for crumb in crumbs offset: 1 %}
   {% if forloop.last %}
     / {{ page.title | downcase }}
   {% else %}
-    / <a href="/docs{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}">{{ crumb | replace:'-',' ' | remove:'.html' | lowercase  }}</a> 
+    / <a href="{{ site.baseurl }}{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}">{{ crumb | replace:'-',' ' | remove:'.html' | lowercase  }}</a> 
   {% endif %}
 {% endfor %}
 </div>

docs/_includes/head.html

@@ -5,7 +5,7 @@
 
 <META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
 
-<link rel="alternate" type="application/rss&#43;xml" href="/docs/index.xml">
+<link rel="alternate" type="application/rss&#43;xml" href="{{ site.baseurl }}/index.xml">
 
 <link rel="shortcut icon" href="{{ site.baseurl }}/assets/favicons/favicon.ico" >
 <link rel="apple-touch-icon" href="{{ site.baseurl }}/assets/favicons/apple-touch-icon.png" sizes="180x180">