Merge branch 'meshery:master' into master

meshery · Jun 19, 2024 · 6ebe5b3 · 6ebe5b3
2 parents b352a6c + 797b03a
commit 6ebe5b3
Show file tree

Hide file tree

Showing 296 changed files with 13,705 additions and 1,522 deletions.
diff --git a/.github/workflows/build-and-release-edge.yml b/.github/workflows/build-and-release-edge.yml
@@ -113,8 +113,8 @@ jobs:
           docker push ${{ secrets.IMAGE_NAME }}:edge-${GITHUB_SHA::8}
           docker push ${{ secrets.IMAGE_NAME }}:edge-${{ env.LATEST_TAG }}
 
-  update-staging-playground:
-    needs:
-      - docker-build-push
-    uses: meshery/meshery/.github/workflows/cncf-staging-playground-deploy-meshery.yaml@master
-    secrets: inherit
+  # update-staging-playground:
+  # needs:
+  # - docker-build-push
+  # uses: meshery/meshery/.github/workflows/cncf-staging-playground-deploy-meshery.yaml@
+  # secrets: inherit
diff --git a/.github/workflows/model-generator.yml b/.github/workflows/model-generator.yml
@@ -43,7 +43,6 @@ jobs:
           commit_options: "--signoff"
           commit_message: "New Models generated"
           branch: master
-
       - name: Send Email on Model Generator Failure
         if: failure()
         uses: dawidd6/action-send-mail@v3.7.1
@@ -59,7 +58,41 @@ jobs:
           body: |
             The GitHub Actions workflow in ${{ github.repository }} has failed.
             You can find more details in the GitHub Actions log ${{ github.workflow }}.
-
+  check-and-email-registry-generate-error:
+    name: Check and Email Error Log
+    runs-on: ubuntu-22.04
+    needs: generate-components
+    steps:
+      - name: Download registry-generate-error
+        uses: actions/download-artifact@v4
+        with:
+          name: generate-logs
+          path: ~/.meshery/logs/registry
+      - name: Check registry-generate-error file
+        id: check-registry-generate-error
+        run: |
+          if [ -s ~/.meshery/logs/registry/Errors ]; then
+            echo "registry-generate-error is not empty"
+            echo "registry-generate-error=true" >> $GITHUB_ENV
+          else
+            echo "registry-generate-error is empty"
+            echo "registry-generate-error=false" >> $GITHUB_ENV
+          fi
+      - name: Send Email on Error Logs
+        if: env.registry-generate-error == 'true'
+        uses: dawidd6/action-send-mail@v3.7.1
+        with:
+          server_address: smtp.gmail.com
+          server_port: 465
+          username: ${{ secrets.MAIL_USERNAME }}
+          password: ${{ secrets.MAIL_PASSWORD }}
+          subject: Model Generator Error Log
+          from: |
+            "Model Generator" <no-reply@meshery.io>
+          to: developers@meshery.io
+          body: |
+            The model generation process encountered errors. Please find the attached error log for details.
+          attachments: ~/.meshery/logs/registry/Errors
   update-components:
     name: Update Components
     needs: generate-components
@@ -107,4 +140,4 @@ jobs:
           to: developers@meshery.io
           body: |
             The GitHub Actions workflow in ${{ github.repository }} has failed.
-            You can find more details in the GitHub Actions log ${{ github.workflow }}.
+            You can find more details in the GitHub Actions log ${{ github.workflow }}.
diff --git a/README.md b/README.md
@@ -55,6 +55,7 @@ A self-service engineering platform, <a href="https://meshery.io">Meshery</a>, i
 
 <br />
 <br />
+
 - [Functionality](#functionality)
   - [Meshery Architecture](#meshery-architecture)
   - [Join the Meshery community!](#join-the-meshery-community)

diff --git a/docs/_data/discuss/meshery.json b/docs/_data/discuss/meshery.json
diff --git a/docs/_data/discuss/mesheryctl.json b/docs/_data/discuss/mesheryctl.json
diff --git a/docs/_data/errorref/meshery-server_errors_export.json b/docs/_data/errorref/meshery-server_errors_export.json
diff --git a/docs/_data/errorref/mesheryctl_errors_export.json b/docs/_data/errorref/mesheryctl_errors_export.json
diff --git a/docs/_data/mesheryctlcommands/cmds.yml b/docs/_data/mesheryctlcommands/cmds.yml
@@ -841,11 +841,15 @@ registry:
         spreadsheet_id:
           name: --spreadsheet-id
           description: id of the spreadsheet to download
+
 model:
   name: model
   description: A unit of packaging to define managed infrastructure and their relationships, and details specifics of how to manage them.
   usage: mesheryctl model [command] [flags]
   flags:
+    count:
+      name: --count
+      description: (optional) Get the number of models in total
     help:
       name: --help, -h
       description: help for model
@@ -857,9 +861,6 @@ model:
       description: List models present in the registry
       usage: mesheryctl model list [flags]
       flags:
-        count:
-          name: --count
-          description: (optional) Get the number of models in total
         page:
           name: --page, -p
           description: list models by specific page number (25 models per page)
@@ -876,6 +877,46 @@ model:
           name: -o, --output-format
           description: (optional) format to display in [json|yaml] (default "yaml")
 
+components:
+  name: components
+  description: Fundamental building block used to represent and define the infrastructure under management
+  usage: mesheryctl components [command] [flags]
+  flags:
+    count:
+      name: --count
+      description: (optional) Get the number of components in total
+    help:
+      name: --help, -h
+      description: help for components
+      usage: mesheryctl components --help
+      example: mesheryctl components --help
+  subcommands:
+    list:
+      name: list
+      description: List all components registered in Meshery Server
+      usage: mesheryctl components list [flags]
+      flags:
+        page:
+          name: --page, -p
+          description: list components by specific page number (25 models per page)
+    search:
+      name: search
+      description: Using a keyword(s) search the registry for matching component(s)
+      usage: mesheryctl components search [keyword]
+    view:
+      name: view
+      description: View details of a specific component
+      usage: mesheryctl components view [component-name]
+      flags:
+        output-format:
+          name: -o, --output-format
+          description: (optional) format to display in [json|yaml] (default "yaml")
+        save:
+          name: --save
+          description: Save output as a JSON/YAML file
+          usage: mesheryctl components view --output-format [json|yaml] --save [filepath]
+          example: mesheryctl components view --save "bookInfo.yaml" --output-format yaml
+
 exp:
   name: exp
   description: Experimental features

diff --git a/docs/_data/toc.yml b/docs/_data/toc.yml
@@ -270,8 +270,11 @@
         - title: Models ↆ
           url: project/contributing/contributing-models
           grandchildren:
+          - title: Components
+            url: project/contributing/contributing-components
           - title: Relationships
             url: project/contributing/contributing-relationships
+
 - title: 📖 Reference
   url: reference
   links:

diff --git a/docs/_includes/head.html b/docs/_includes/head.html
@@ -40,7 +40,7 @@
     content="https://raw.githubusercontent.com/meshery/meshery/master/docs/assets/img/meshery-cncf-twitter.png" />
 
     <!-- <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/palette.css" /> -->
-  <!-- <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/anchorjs.css" /> -->
+  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/anchorjs.css" />
   <link rel="stylesheet" href="{{ '/assets/css/sass.css' | relative_url }}" />
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css" />
 

diff --git a/docs/_includes/relationships.html b/docs/_includes/relationships.html
@@ -88,7 +88,7 @@
         <img alt="Edge - Permission" src="{{ site.baseurl }}/assets/img/meshmodel/relationships/permission_edge_relationship_clusterrole_deployment.png"/> -->
         <br>
         <figure>
-            <figcaption>type: `Non-Binding`, subType: `Network`: Network Policy (Pod to Pod) <a target="_blank" href="https://playground.meshery.io/extension/meshmap?mode=design&design=58fda714-eaa4-490f-b228-b8bcfe3a1e47s"> (open in playground)</a></figcaption>
+            <figcaption><code>type:non-binding</code>, subType: `Network`: Network Policy (Pod to Pod) <a target="_blank" href="https://playground.meshery.io/extension/meshmap?mode=design&design=58fda714-eaa4-490f-b228-b8bcfe3a1e47s"> (open in playground)</a></figcaption>
         </figure>
         <img alt="Edge - Network Policy" src="{{ site.baseurl }}/assets/img/meshmodel/relationships/edge_firewall_relationship_pod_to_pod.svg">
         </details>

diff --git a/docs/_models/grafana-agent-operator.md b/docs/_models/grafana-agent-operator.md
@@ -10,6 +10,38 @@ integrations-category: Observability and Analysis
 integrations-subcategory: Monitoring
 registrant: Artifact Hub
 components: 
+- name: pod-monitor
+  colorIcon: assets/img/integrations/grafana-agent-operator/components/pod-monitor/icons/color/pod-monitor-color.svg
+  whiteIcon: assets/img/integrations/grafana-agent-operator/components/pod-monitor/icons/white/pod-monitor-white.svg
+  description: 
+- name: probe
+  colorIcon: assets/img/integrations/grafana-agent-operator/components/probe/icons/color/probe-color.svg
+  whiteIcon: assets/img/integrations/grafana-agent-operator/components/probe/icons/white/probe-white.svg
+  description: 
+- name: service-monitor
+  colorIcon: assets/img/integrations/grafana-agent-operator/components/service-monitor/icons/color/service-monitor-color.svg
+  whiteIcon: assets/img/integrations/grafana-agent-operator/components/service-monitor/icons/white/service-monitor-white.svg
+  description: 
+- name: grafana-agent
+  colorIcon: assets/img/integrations/grafana-agent-operator/components/grafana-agent/icons/color/grafana-agent-color.svg
+  whiteIcon: assets/img/integrations/grafana-agent-operator/components/grafana-agent/icons/white/grafana-agent-white.svg
+  description: 
+- name: integration
+  colorIcon: assets/img/integrations/grafana-agent-operator/components/integration/icons/color/integration-color.svg
+  whiteIcon: assets/img/integrations/grafana-agent-operator/components/integration/icons/white/integration-white.svg
+  description: 
+- name: logs-instance
+  colorIcon: assets/img/integrations/grafana-agent-operator/components/logs-instance/icons/color/logs-instance-color.svg
+  whiteIcon: assets/img/integrations/grafana-agent-operator/components/logs-instance/icons/white/logs-instance-white.svg
+  description: 
+- name: metrics-instance
+  colorIcon: assets/img/integrations/grafana-agent-operator/components/metrics-instance/icons/color/metrics-instance-color.svg
+  whiteIcon: assets/img/integrations/grafana-agent-operator/components/metrics-instance/icons/white/metrics-instance-white.svg
+  description: 
+- name: pod-logs
+  colorIcon: assets/img/integrations/grafana-agent-operator/components/pod-logs/icons/color/pod-logs-color.svg
+  whiteIcon: assets/img/integrations/grafana-agent-operator/components/pod-logs/icons/white/pod-logs-white.svg
+  description: 
 featureList: [
   "Meshery discovers your Grafana servers",
   "Easily import existing Grafana dashboards and panels into Meshery",

diff --git a/docs/_models/kong.md b/docs/_models/kong.md
@@ -54,6 +54,10 @@ components:
   colorIcon: assets/img/integrations/kong/components/kong-vault/icons/color/kong-vault-color.svg
   whiteIcon: assets/img/integrations/kong/components/kong-vault/icons/white/kong-vault-white.svg
   description: 
+- name: kong-custom-entity
+  colorIcon: assets/img/integrations/kong/components/kong-custom-entity/icons/color/kong-custom-entity-color.svg
+  whiteIcon: assets/img/integrations/kong/components/kong-custom-entity/icons/white/kong-custom-entity-white.svg
+  description: 
 featureList: [
   "Advanced routing, load balancing, health checking - all configurable via a RESTful admin API or declarative configuration.",
   "Authentication and authorization for APIs using methods like JWT, basic auth, OAuth, ACLs and more.",

diff --git a/docs/_releases/v0.7.74.md b/docs/_releases/v0.7.74.md
@@ -1,17 +1,20 @@
 ---
 layout: release
-date: 2024-06-14
+date: 2024-06-15
 tag: v0.7.74
 ---
 
 ## What's New
 ## 🔤 General
+- [Dosc] Revert removal of line return to ensure README hyperlinks show as intended. @jameshorton2337 (#11182)
+
 ## ⌨️ Meshery CLI
 
 - fix: logs to have same current model and extracted model  @Jougan-0 (#11118)
 
 ## 🖥 Meshery UI
 
+- fix notistack crash @codeSafari10 (#11186)
 - fix height of registry section @sudhanshutech (#10642)
 - remove unwanted styling add tooltip for unpublish confirmation @sudhanshutech (#11172)
 - [bug] fix crash of connections page @sudhanshutech (#11171)
@@ -26,7 +29,11 @@ tag: v0.7.74
 
 - Bump github.com/vektah/gqlparser/v2 from 2.5.11 to 2.5.14 @dependabot (#11167)
 
+## 📖 Documentation
+
+- Updated the installation link of Meshery by Minikube using Helm @Aviral0702 (#11181)
+
 ## 👨🏽‍💻 Contributors
 
 Thank you to our contributors for making this release possible:
-@Jougan-0, @MUzairS15, @aabidsofi19, @dependabot, @dependabot[bot], @leecalcote and @sudhanshutech
+@Aviral0702, @Jougan-0, @MUzairS15, @aabidsofi19, @codeSafari10, @dependabot, @dependabot[bot], @jameshorton2337, @leecalcote and @sudhanshutech
diff --git a/docs/assets/css/anchorjs.css b/docs/assets/css/anchorjs.css
@@ -34,7 +34,7 @@
 :target::before {
   content: "";
   display: block;
-  margin-top: -80px;
+  margin-top: 5rem;
   height: 80px;
   width: 1px;
 }