Update default org Main Org to Volkov Labs (#38)

* Update default org Main Org to Volkov Labs * Update to Grafana 9.3.2 * Update Plugins descriptions and screenshot
VolkovLabs · Dec 25, 2022 · 0af3968 · 0af3968
1 parent 7df2de5
commit 0af3968
Show file tree

Hide file tree

Showing 19 changed files with 679 additions and 602 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.0.0 (2022-12-25)
+
+### Features / Enhancements
+
+- Update default org Main Org to Volkov Labs (#38)
+- Update to Grafana 9.3.2 (#38)
+- Update Plugins descriptions and screenshot (#38)
+
 ## 1.5.0 (2022-12-02)
 
 ### Features / Enhancements

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:9.3.1
+FROM grafana/grafana:9.3.2
 
 # Set Grafana options
 ENV GF_ENABLE_GZIP=true
@@ -46,6 +46,9 @@ COPY src/img/logo.svg /usr/share/grafana/public/img/grafana_icon.svg
 COPY img/background.svg /usr/share/grafana/public/img/g8_login_dark.svg
 COPY img/background.svg /usr/share/grafana/public/img/g8_login_light.svg
 
+# Update Main Org. to Volkov Labs
+RUN sed -i 's|Main Org.|VolkovLab|g' /usr/share/grafana/bin/grafana-server
+
 # Update Javascript
 RUN find /usr/share/grafana/public/build/ -name *.js -exec sed -i 's|"AppTitle","Grafana")|"AppTitle","Volkov Labs")|g' {} \;
 RUN find /usr/share/grafana/public/build/ -name *.js -exec sed -i 's|"LoginTitle","Welcome to Grafana")|"LoginTitle","Welcome to Volkov Labs")|g' {} \;

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Volkov Labs
+   Copyright 2022-2023 Volkov Labs
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![Application](https://raw.githubusercontent.com/volkovlabs/volkovlabs-app/main/img/app.png)
 
-[![Grafana 9](https://img.shields.io/badge/Grafana-9.3.1-orange)](https://www.grafana.com)
+[![Grafana 9](https://img.shields.io/badge/Grafana-9.3.2-orange)](https://www.grafana.com)
 [![YouTube](https://img.shields.io/badge/YouTube-Playlist-red)](https://youtube.com/playlist?list=PLPow72ygztmTm_zY_PYqJtRYpMPpZglYC)
 ![CI](https://github.com/volkovlabs/volkovlabs-app/workflows/CI/badge.svg)
 [![codecov](https://codecov.io/gh/VolkovLabs/volkovlabs-app/branch/main/graph/badge.svg?token=2W9VR0PG5N)](https://codecov.io/gh/VolkovLabs/volkovlabs-app)

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -8,4 +8,4 @@ rm -rf $GRAFANA_APP_PATH
 cp -pr $SRC $GRAFANA_APP_PATH
 echo "Copying Application plugin ${SRC} to ${GRAFANA_APP_PATH}..."
 
-exec /run.sh "$@"
+exec /run.sh "$@"
diff --git a/img/app.png b/img/app.png
diff --git a/package.json b/package.json
@@ -2,10 +2,10 @@
   "author": "Volkov Labs",
   "description": "Volkov Labs Application plugin",
   "devDependencies": {
-    "@grafana/data": "9.3.1",
-    "@grafana/runtime": "9.3.1",
-    "@grafana/toolkit": "9.3.1",
-    "@grafana/ui": "9.3.1",
+    "@grafana/data": "9.3.2",
+    "@grafana/runtime": "9.3.2",
+    "@grafana/toolkit": "9.3.2",
+    "@grafana/ui": "9.3.2",
     "@types/enzyme": "^3.10.12",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "enzyme": "^3.11.0",
@@ -28,5 +28,5 @@
     "upgrade": "yarn upgrade --latest",
     "watch": "grafana-toolkit plugin:dev --watch"
   },
-  "version": "1.5.0"
+  "version": "2.0.0"
 }
diff --git a/provisioning/dashboards/news.json b/provisioning/dashboards/news.json
@@ -24,7 +24,32 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "links": [],
+  "links": [
+    {
+      "asDropdown": false,
+      "icon": "info",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "Volkov Labs",
+      "tooltip": "",
+      "type": "link",
+      "url": "https://volkovlabs.io"
+    },
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": true,
+      "title": "YouTube",
+      "tooltip": "",
+      "type": "link",
+      "url": "https://youtube.com/@volkovlabs"
+    }
+  ],
   "liveNow": false,
   "panels": [
     {

diff --git a/src/components/Plugins/ApacheECharts.tsx b/src/components/Plugins/ApacheECharts.tsx
@@ -43,6 +43,14 @@ export class ApacheECharts extends PureComponent {
           <TagList tags={['Panel']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-echarts-panel/"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             icon="star"
@@ -61,21 +69,13 @@ export class ApacheECharts extends PureComponent {
           </LinkButton>
           <LinkButton
             variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/tXQ9_367z/apache-echarts-panel?orgId=1"
-          >
-            Live
-          </LinkButton>
-          <LinkButton
-            variant="primary"
             icon="cloud-download"
             target="_blank"
             href="https://grafana.com/grafana/plugins/volkovlabs-echarts-panel/"
           >
             Grafana
           </LinkButton>
-          <LinkButton variant="success" icon="building" target="_blank" href="https://echarts.volkovlabs.io">
+          <LinkButton variant="secondary" icon="building" target="_blank" href="https://echarts.volkovlabs.io">
             Examples
           </LinkButton>
         </Card.Actions>

diff --git a/src/components/Plugins/Balena.tsx b/src/components/Plugins/Balena.tsx
@@ -39,6 +39,14 @@ export class Balena extends PureComponent {
           <TagList tags={['Application', 'Private']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-balena-app"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             icon="star"
@@ -56,15 +64,7 @@ export class Balena extends PureComponent {
             YouTube
           </LinkButton>
           <LinkButton
-            variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/8DuPr3e7z/balena-application?orgId=1"
-          >
-            Live
-          </LinkButton>
-          <LinkButton
-            variant="primary"
+            variant="secondary"
             icon="compass"
             target="_blank"
             href="https://hub.balena.io/organizations/volkovlabs/projects/balena-app"

diff --git a/src/components/Plugins/Base64Image.tsx b/src/components/Plugins/Base64Image.tsx
@@ -35,6 +35,14 @@ export class Base64Image extends PureComponent {
           <TagList tags={['Panel']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-image-panel/"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             target="_blank"
@@ -53,14 +61,6 @@ export class Base64Image extends PureComponent {
           </LinkButton>
           <LinkButton
             variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/bN3aCqe7k/base64-image-pdf?orgId=1"
-          >
-            Live
-          </LinkButton>
-          <LinkButton
-            variant="primary"
             icon="cloud-download"
             target="_blank"
             href="https://grafana.com/grafana/plugins/volkovlabs-image-panel/"

diff --git a/src/components/Plugins/Calendar.tsx b/src/components/Plugins/Calendar.tsx
@@ -51,6 +51,14 @@ export class Calendar extends PureComponent {
           <TagList tags={['Panel']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-calendar-panel/"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             icon="star"
@@ -69,14 +77,6 @@ export class Calendar extends PureComponent {
           </LinkButton>
           <LinkButton
             variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/0fgJcb4Vz/calendar-panel?orgId=1"
-          >
-            Live
-          </LinkButton>
-          <LinkButton
-            variant="primary"
             icon="cloud-download"
             target="_blank"
             href="https://grafana.com/grafana/plugins/marcusolsson-calendar-panel/"

diff --git a/src/components/Plugins/DataManipulation.tsx b/src/components/Plugins/DataManipulation.tsx
@@ -50,6 +50,14 @@ export class DataManipulation extends PureComponent {
           <TagList tags={['Panel']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-form-panel/"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             icon="star"
@@ -68,14 +76,6 @@ export class DataManipulation extends PureComponent {
           </LinkButton>
           <LinkButton
             variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/h5IJk66nk/data-manipulation-panel?orgId=1"
-          >
-            Live
-          </LinkButton>
-          <LinkButton
-            variant="primary"
             icon="cloud-download"
             target="_blank"
             href="https://grafana.com/grafana/plugins/volkovlabs-form-panel/"

diff --git a/src/components/Plugins/DynamicText.tsx b/src/components/Plugins/DynamicText.tsx
@@ -35,6 +35,14 @@ export class DynamicText extends PureComponent {
           <TagList tags={['Panel']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-dynamictext-panel/"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             icon="star"
@@ -53,14 +61,6 @@ export class DynamicText extends PureComponent {
           </LinkButton>
           <LinkButton
             variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/2L2sYjVVz/dynamic-text-panel?orgId=1"
-          >
-            Live
-          </LinkButton>
-          <LinkButton
-            variant="primary"
             icon="cloud-download"
             target="_blank"
             href="https://grafana.com/grafana/plugins/marcusolsson-dynamictext-panel/"

diff --git a/src/components/Plugins/Environment.tsx b/src/components/Plugins/Environment.tsx
@@ -48,6 +48,14 @@ export class Environment extends PureComponent {
           <TagList tags={['Data Source', 'Private']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-env-datasource/"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             icon="star"
@@ -64,14 +72,6 @@ export class Environment extends PureComponent {
           >
             YouTube
           </LinkButton>
-          <LinkButton
-            variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/B0kLhzR4k/environment-data-source?orgId=1"
-          >
-            Live
-          </LinkButton>
         </Card.Actions>
       </Card>
     );

diff --git a/src/components/Plugins/RSSAtom.tsx b/src/components/Plugins/RSSAtom.tsx
@@ -37,6 +37,14 @@ export class RSSAtom extends PureComponent {
           <TagList tags={['Data Source']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-rss-datasource/"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             icon="star"
@@ -55,14 +63,6 @@ export class RSSAtom extends PureComponent {
           </LinkButton>
           <LinkButton
             variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/zUDs5zRVk/rss-atom-data-source?orgId=1"
-          >
-            Live
-          </LinkButton>
-          <LinkButton
-            variant="primary"
             icon="cloud-download"
             target="_blank"
             href="https://grafana.com/grafana/plugins/volkovlabs-rss-datasource/"

diff --git a/src/components/Plugins/Static.tsx b/src/components/Plugins/Static.tsx
@@ -30,6 +30,14 @@ export class Static extends PureComponent {
           <TagList tags={['Data Source']} />
         </Card.Tags>
         <Card.Actions>
+          <LinkButton
+            variant="primary"
+            icon="book-open"
+            target="_blank"
+            href="https://volkovlabs.io/plugins/volkovlabs-static-datasource/"
+          >
+            Documentation
+          </LinkButton>
           <LinkButton
             variant="secondary"
             icon="star"
@@ -48,14 +56,6 @@ export class Static extends PureComponent {
           </LinkButton>
           <LinkButton
             variant="success"
-            icon="monitor"
-            target="_blank"
-            href="https://live.volkovlabs.io/d/heM1lTN4z/static-data-source?orgId=1"
-          >
-            Live
-          </LinkButton>
-          <LinkButton
-            variant="primary"
             icon="cloud-download"
             target="_blank"
             href="https://grafana.com/grafana/plugins/marcusolsson-static-datasource/"