update fork and local repo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,9 +15,9 @@ assignees: ''
 <!-- Add screenshots, if applicable, to help explain your problem. -->
 
 #### Environment:
-- Host OS: 
 - Meshery Version: 
 - Kubernetes Version: 
+- Host OS:
 - Browser: 
 
 <!-- Optional 
@@ -27,3 +27,4 @@ Steps to reproduce the behavior:
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+-->

.github/ISSUE_TEMPLATE/component_mesheryctl.md

@@ -1,13 +1,13 @@
 ---
-name: ⌨️ Component: mesheryctl (Meshery CLI)
-about: Report an issue/ feature request for mesheryctl(Meshery CLI)
+name: ⌨️ [Component] mesheryctl (Meshery CLI)
+about: Report a bug or feature request for mesheryctl (Meshery CLI)
 title: '[mesheryctl]'
 labels: 'component/mesheryctl'
 assignees: ''
 ---
 
-<!-- Please update the mesheryctl- Command Reference and Tracker spreadsheet -->
-Refer the [mesheryctl Command Tracker](https://docs.google.com/spreadsheets/d/1q63sIGAuCnIeDs8PeM-0BAkNj8BBgPUXhLbe1Y-318o/edit#gid=0) for current status of `mesheryctl`.
+<!-- Please update the mesheryctl Command Tracker spreadsheet -->
+_See [mesheryctl Command Tracker](https://bit.ly/3dqXy1q) for current status of commands._
 
 #### Current Behavior
 <!-- A brief description of what the problem is. (e.g. I need to be able to...) -->
@@ -31,7 +31,7 @@ Refer the [mesheryctl Command Tracker](https://docs.google.com/spreadsheets/d/1q
 
 ---
 
-[Optional (for feature requests)]
+<!-- Optional for feature requests -->
 
 #### Implementation
 <!-- Specifics on the approach to fulfilling the feature request. -->
@@ -49,4 +49,4 @@ Refer the [mesheryctl Command Tracker](https://docs.google.com/spreadsheets/d/1q
 - [mesheryctl Contributing Guide](https://github.com/layer5io/meshery/blob/master/mesheryctl/README.md)
 - [Beginner's guide to contributing to Meshery and mesheryctl](https://youtu.be/hh_kFLZx3G4)
 - [mesheryctl Command Tracker](https://docs.google.com/spreadsheets/d/1q63sIGAuCnIeDs8PeM-0BAkNj8BBgPUXhLbe1Y-318o/edit#gid=0)
-- [Meshery CLI Commands and Documentation](https://docs.google.com/document/d/1xRlFpElRmybJ3WacgPKXgCSiQ2poJl3iCCV1dAalf0k/edit#heading=h.5fucij4hc5wt)
+- [Meshery CLI Commands and Documentation](https://docs.google.com/document/d/1xRlFpElRmybJ3WacgPKXgCSiQ2poJl3iCCV1dAalf0k/edit#heading=h.5fucij4hc5wt)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -11,14 +11,14 @@ assignees: ''
 #### Desired Behavior
 <!-- A brief description of the enhancement. -->
 
----
-[Optional]
-
 #### Implementation
-<!-- Specifics on the approach to fulfilling the feature request. -->
+<!-- [Optional] Specifics on the approach to fulfilling the feature request. -->
 
 #### Acceptance Tests
-<!-- Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->
+<!-- [Optional] Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->
 
 #### Mockups
-<!-- Any visual diagrams of the desired user interface. -->
+<!-- [Optional] Any visual diagrams of the desired user interface. -->
+
+---
+**[Contributor Guide](https://docs.meshery.io/project/contributing)**

.github/config.yml

@@ -23,10 +23,10 @@ firstPRMergeComment: >
      	   	    	    	 Thank you for contributing to the Layer5 community! :tada:
   \
   \
-  ![Congrats!](https://raw.githubusercontent.com/layer5io/meshery/master/.github/welcome/Layer5-celebration.png)
+  ![Congrats!](https://github.com/layer5io/layer5/blob/master/.github/welcome/Layer5-celebration.png)
   \
   \
-    	   	    	    	 :star: Please leave a [star on the project](../stargazers). :smile:
+    	   	    	    	 [Join the community](http://slack.layer5.io), if you haven't yet and please leave a :star: [star on the project](../stargazers). :smile: and
 
 #-------------------------------------------------------------------------------
 # Configuration for request-info - https://github.com/behaviorbot/request-info

.github/release-drafter.yml

@@ -1,4 +1,4 @@
-name-template: 'v$NEXT_PATCH_VERSION'
+name-template: 'Meshery v$NEXT_PATCH_VERSION'
 tag-template: 'v$NEXT_PATCH_VERSION'
 categories:
   - title: '🚀 Features'
@@ -27,3 +27,7 @@ template: |
   
   Thank you to our contributors for making this release possible:
   $CONTRIBUTORS
+autolabeler:
+  - label: 'area/docs'
+    branch:
+      - '/docs/'

.github/workflows/notify-providers.yaml

@@ -18,7 +18,7 @@ jobs:
         name: "Build and Publish"
         repo: layer5labs/meshery-extensions
         token: ${{ secrets.GITHUB_PAT }}
-        version: edge-latest
+        version: master
     - name: trigger plugins for release
       if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
       uses: kumarabd/trigger-remote-action@master

.github/workflows/release-drafter.yml

@@ -2,36 +2,33 @@ name: Release Drafter
 
 on:
   push:
-    # our release branch
     branches:
-      - master
+      - '!*'
+    tags:
+      - 'v*'
 
 jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      # Drafts your next Release notes as Pull Requests are merged into "master"
       - 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.GITHUB_TOKEN }}
 
       - name: Checkout release notes
-        if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
         uses: actions/checkout@v2
 
       - name: Write release notes to markdown file
         id: md_writer
-        if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
         run: |
-          printf '%b\n' "---\nlayout: release\ndate: $(date +'%Y-m-%d')\ntag: ${{ steps.release_drafter.outputs.tag_name }}\n---\n\n${{ steps.release_drafter.outputs.body }} " > ./docs/_releases/${{ steps.release_drafter.outputs.tag_name }}.md
+          printf '%b\n' "---\nlayout: release\ndate: $(date +'%Y-%m-%d')\ntag: ${{ steps.release_drafter.outputs.tag_name }}\n---\n\n${{ steps.release_drafter.outputs.body }} " > ./docs/_releases/${{ steps.release_drafter.outputs.tag_name }}.md
 
       - name: Create Pull Request
         id: cpr
-        if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
         uses: peter-evans/create-pull-request@v3
         with:
           token: ${{ secrets.RELEASE_NOTES_PAT }}
@@ -41,6 +38,7 @@ jobs:
           signoff: true
           branch: docs/automated-release-notes
           delete-branch: true
+          base: master
           title: '[Docs] Release Notes for Meshery ${{ steps.release_drafter.outputs.tag_name }}'
           body: |
             An auto-generated pull request to document release notes for Meshery ${{ steps.release_drafter.outputs.tag_name }}
@@ -56,7 +54,6 @@ jobs:
           draft: false
 
       - name: Verify PR
-        if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
         run: |
           echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
           echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

CODE_OF_CONDUCT.md

@@ -1,4 +1,4 @@
-# Layer5 Community Code of Conduct
+# Meshery Code of Conduct
 
 The Layer5 community follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
 

Makefile

@@ -21,7 +21,7 @@ docker:
 
 # Runs Meshery in a container locally and points to locally-running
 #  Meshery Cloud for user authentication.
-docker-run-local-cloud: 
+docker-run-local-cloud:
 	(docker rm -f meshery) || true
 	docker run --name meshery -d \
 	--link meshery-cloud:meshery-cloud \
@@ -33,7 +33,7 @@ docker-run-local-cloud:
 
 # Runs Meshery in a container locally and points to remote
 #  Meshery Cloud for user authentication.
-docker-run-cloud: 
+docker-run-cloud:
 	(docker rm -f meshery) || true
 	docker run --name meshery -d \
 	-e PROVIDER_BASE_URLS=$(MESHERY_CLOUD_PROD) \
@@ -47,7 +47,7 @@ docker-run-cloud:
 # Runs Meshery on your local machine and points to locally-running
 #  Meshery Cloud for user authentication.
 
-run-local-cloud: 
+run-local-cloud:
 	cd cmd; go clean; rm meshery; go mod tidy; \
 	go build -ldflags="-w -s -X main.version=${GIT_VERSION} -X main.commitsha=${GIT_COMMITSHA} -X main.releasechannel=${RELEASE_CHANNEL}" -tags draft -a -o meshery; \
 	PROVIDER_BASE_URLS=$(MESHERY_CLOUD_DEV) \
@@ -59,7 +59,7 @@ run-local-cloud:
 
 # Builds and runs Meshery to run on your local machine.
 #  and points to remote Meshery Cloud for user authentication.
-run-local: 
+run-local:
 	cd cmd; go clean; rm meshery; go mod tidy; \
 	go build -ldflags="-w -s -X main.version=${GIT_VERSION} -X main.commitsha=${GIT_COMMITSHA} -X main.releasechannel=${RELEASE_CHANNEL}" -tags draft -a -o meshery; \
 	PROVIDER_BASE_URLS=$(MESHERY_CLOUD_PROD) \
@@ -91,11 +91,13 @@ golangci-run:
 	$(GOPATH)/bin/golangci-lint run
 
 proto:
+	# see https://grpc.io/docs/languages/go/quickstart/
 	# go get -u google.golang.org/grpc
-	# go get -u github.com/golang/protobuf/protoc-gen-go
+	# go get -u google.golang.org/protobuf/cmd/protoc-gen-go \
+	#         google.golang.org/grpc/cmd/protoc-gen-go-grpc
 	# PATH=$(PATH):`pwd`/../protoc/bin:$(GOPATH)/bin
 	# export PATH=$PATH:`pwd`/../protoc/bin:$GOPATH/bin
-	protoc -I meshes/ meshes/meshops.proto --go_out=plugins=grpc:./meshes/
+	protoc -I meshes/ meshes/meshops.proto --go-grpc_out=./meshes/ --go_out=./meshes/
 
 # Installs dependencies for building the user interface.
 setup-ui-libs:

ROADMAP.md

@@ -19,9 +19,9 @@ Milestones on mesheryctl's high-level roadmap-
 
 Milestone | Features
 --- | ---
-v0.6.0 | <p>pervasive kubernetes support</p><p><li>Create `patterns`</li><li>Refactoring `perf` to support SMP better</li><li>Confirm support for Linux, Windows, and MacOS across all current commands</li></p>
+v0.6.0 | <p><li>pervasive kubernetes support </li> </p><p><li>Create `patterns`</li><li>Refactoring `perf` to support SMP better</li><li>Confirm support for Linux, Windows, and MacOS across all current commands</li></p>
 v0.7.0 | <p><li>Create `mesh` (adapter operations)</li><li>Confirm support for environment and multi-cluster</li></p>
 v0.8.0 | <p>gRPC (streaming of status and events)<p><p><li>Colorizing output</li></p>
-v0.9.0 | OAuth
+v0.9.0 | <Li>OAuth</Li><Li>`system check` - pre and post flight prereq check</li><Li>`system report` - diagnostics reporting</li>
 
-Refer the [Meshery Roadmap](https://docs.google.com/document/d/1kvcz8jdvFwXmYBBaY2-3fHHUUoy1GJLpZZXuoxZQoOk/edit#) document for detailed info.
+Refer the [Meshery Roadmap](https://docs.google.com/document/d/1kvcz8jdvFwXmYBBaY2-3fHHUUoy1GJLpZZXuoxZQoOk/edit#) document for detailed info.

cmd/main.go

@@ -6,8 +6,10 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"os/exec"
 	"os/signal"
 	"path"
+	"strings"
 	"time"
 
 	"github.com/layer5io/meshery/handlers"
@@ -55,13 +57,19 @@ func main() {
 		os.Exit(1)
 	}
 
+	operatingSystem, err := exec.Command("uname", "-s").Output()
+	if err != nil {
+		logrus.Error(err)
+	}
+
 	ctx := context.Background()
 
 	viper.AutomaticEnv()
 
 	viper.SetDefault("PORT", 8080)
 	viper.SetDefault("ADAPTER_URLS", "")
 	viper.SetDefault("BUILD", version)
+	viper.SetDefault("OS", strings.ToLower(string(operatingSystem)))
 	viper.SetDefault("COMMITSHA", commitsha)
 	viper.SetDefault("RELEASE_CHANNEL", releasechannel)
 
@@ -130,26 +138,14 @@ func main() {
 	}
 	defer smiResultPersister.CloseResultPersister()
 
-	resultPersister, err := models.NewBitCaskResultsPersister(viper.GetString("USER_DATA_FOLDER"))
-	if err != nil {
-		logrus.Fatal(err)
-	}
-	defer resultPersister.CloseResultPersister()
-
 	testConfigPersister, err := models.NewBitCaskTestProfilesPersister(viper.GetString("USER_DATA_FOLDER"))
 	if err != nil {
 		logrus.Fatal(err)
 	}
 	defer testConfigPersister.CloseTestConfigsPersister()
 
-	performanceProfilePersister, err := models.NewBitCaskPerformanceProfilesPersister(viper.GetString("USER_DATA_FOLDER"))
-	if err != nil {
-		logrus.Fatal(err)
-	}
-	defer performanceProfilePersister.ClosePerformanceProfilePersister()
-
 	dbHandler, err := database.New(database.Options{
-		Filename: fmt.Sprintf("%s/meshsync.sql", viper.GetString("USER_DATA_FOLDER")),
+		Filename: fmt.Sprintf("%s/mesherydb.sql", viper.GetString("USER_DATA_FOLDER")),
 		Engine:   database.SQLITE,
 		Logger:   log,
 	})
@@ -163,6 +159,9 @@ func main() {
 	err = dbHandler.AutoMigrate(
 		meshsyncmodel.KeyValue{},
 		meshsyncmodel.Object{},
+		models.PerformanceProfile{},
+		models.MesheryResult{},
+		models.MesheryPattern{},
 	)
 	if err != nil {
 		logrus.Fatal(err)
@@ -171,10 +170,11 @@ func main() {
 	lProv := &models.DefaultLocalProvider{
 		ProviderBaseURL:              DefaultProviderURL,
 		MapPreferencePersister:       preferencePersister,
-		ResultPersister:              resultPersister,
+		ResultPersister:              &models.MesheryResultsPersister{DB: &dbHandler},
 		SmiResultPersister:           smiResultPersister,
 		TestProfilesPersister:        testConfigPersister,
-		PerformanceProfilesPersister: performanceProfilePersister,
+		PerformanceProfilesPersister: &models.PerformanceProfilePersister{DB: &dbHandler},
+		MesheryPatternPersister:      &models.MesheryPatternPersister{DB: &dbHandler},
 		GenericPersister:             dbHandler,
 		GraphqlHandler: graphql.New(graphql.Options{
 			Logger:          log,

docs/Gemfile.lock

@@ -70,7 +70,7 @@ GEM
       jekyll-theme-time-machine (= 0.1.1)
       jekyll-titles-from-headings (= 0.5.3)
       jemoji (= 0.12.0)
-      kramdown (= 2.3.0)
+      kramdown (= 2.3.1)
       kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.3)
       mercenary (~> 0.3)
@@ -196,7 +196,7 @@ GEM
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.0)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)

docs/_data/mesheryctlcommands/global/flags/help.yaml

@@ -0,0 +1,4 @@
+name: help, h
+description: Displays helpful information about any command.
+usage: |
+    `mesheryctl --help | mesheryctl system --help | meshery system start --help`

docs/_data/mesheryctlcommands/global/flags/verbose.yaml

@@ -0,0 +1,4 @@
+name: verbose, v
+description: Sets the log level to debug for verbose output and displays verboose/debug logs.
+usage: |
+    `mesheryctl <command> --verbose`