Update to Grafana 9.3.1 (#36)

* Update to Grafana 9.3.0 * Update packages * Update provisioning * Fix variant * Enable Top navigation
VolkovLabs · Dec 2, 2022 · a9828be · a9828be
1 parent e88562c
commit a9828be
Show file tree

Hide file tree

Showing 9 changed files with 709 additions and 675 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,14 @@
 # Change Log
 
-## 1.5.0 (IN PROGRESS)
+## 1.5.0 (2022-12-02)
 
 ### Features / Enhancements
 
 - Update Docker workflow (#32)
 - Merge plugins in the alphabetical order (#33)
 - Update to Grafana 9.2.4 (#34)
 - Update Dynamic Text Panel 2.0.0 (#35)
+- Update to Grafana 9.3.1 (#36)
 
 ## 1.4.0 (2022-10-29)
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,9 @@
-FROM grafana/grafana:9.2.4
+FROM grafana/grafana:9.3.1
 
 # Set Grafana options
 ENV GF_ENABLE_GZIP=true
 ENV GF_USERS_DEFAULT_THEME=light
+ENV GF_FEATURE_TOGGLES_ENABLE=topnav
 
 # Authentication
 ENV GF_AUTH_ANONYMOUS_ENABLED=true
@@ -48,7 +49,7 @@ COPY img/background.svg /usr/share/grafana/public/img/g8_login_light.svg
 # 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' {} \;
-RUN find /usr/share/grafana/public/build/ -name *.js -exec sed -i 's|{target:"_blank",id:"documentation",text:"Documentation",icon:"document-info",url:"https://grafana.com/docs/grafana/latest/?utm_source=grafana_footer"},{target:"_blank",id:"support",text:"Support",icon:"question-circle",url:"https://grafana.com/products/enterprise/?utm_source=grafana_footer"},{target:"_blank",id:"community",text:"Community",icon:"comments-alt",url:"https://community.grafana.com/?utm_source=grafana_footer"}||g' {} \;
+RUN find /usr/share/grafana/public/build/ -name *.js -exec sed -i 's|{target:"_blank",id:"documentation",text:(0,r.t)("nav.help/documentation","Documentation"),icon:"document-info",url:"https://grafana.com/docs/grafana/latest/?utm_source=grafana_footer"},{target:"_blank",id:"support",text:(0,r.t)("nav.help/support","Support"),icon:"question-circle",url:"https://grafana.com/products/enterprise/?utm_source=grafana_footer"},{target:"_blank",id:"community",text:(0,r.t)("nav.help/community","Community"),icon:"comments-alt",url:"https://community.grafana.com/?utm_source=grafana_footer"}||g' {} \;
 
 RUN find /usr/share/grafana/public/build/ -name *.js -exec sed -i 's|{target:"_blank",id:"version",text:`${e.edition}${s}`,url:t.licenseUrl}||g' {} \;
 RUN find /usr/share/grafana/public/build/ -name *.js -exec sed -i 's|{target:"_blank",id:"version",text:`v${e.version} (${e.commit})`,url:i?"https://github.com/grafana/grafana/blob/main/CHANGELOG.md":void 0}||g' {} \;

diff --git a/README.md b/README.md
@@ -2,10 +2,11 @@
 
 ![Application](https://raw.githubusercontent.com/volkovlabs/volkovlabs-app/main/img/app.png)
 
-[![Grafana 9](https://img.shields.io/badge/Grafana-9.2.2-orange)](https://www.grafana.com)
+[![Grafana 9](https://img.shields.io/badge/Grafana-9.3.1-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)
+[![CodeQL](https://github.com/VolkovLabs/volkovlabs-app/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/VolkovLabs/volkovlabs-app/actions/workflows/codeql-analysis.yml)
 
 ## Introduction
 

diff --git a/package.json b/package.json
@@ -2,10 +2,10 @@
   "author": "Volkov Labs",
   "description": "Volkov Labs Application plugin",
   "devDependencies": {
-    "@grafana/data": "9.2.4",
-    "@grafana/runtime": "9.2.4",
-    "@grafana/toolkit": "9.2.4",
-    "@grafana/ui": "9.2.4",
+    "@grafana/data": "9.3.1",
+    "@grafana/runtime": "9.3.1",
+    "@grafana/toolkit": "9.3.1",
+    "@grafana/ui": "9.3.1",
     "@types/enzyme": "^3.10.12",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "enzyme": "^3.11.0",

diff --git a/provisioning/dashboards/news.json b/provisioning/dashboards/news.json
@@ -24,24 +24,23 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 1,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "datasource": {
         "type": "volkovlabs-rss-datasource",
-        "uid": "rZAdZdf7a"
+        "uid": "rZAdZdf82"
       },
       "gridPos": {
         "h": 37,
         "w": 12,
         "x": 0,
         "y": 0
       },
-      "id": 2,
+      "id": 3,
       "options": {
-        "content": "<table width=100% style='border:0'>\n<tr>\n<td style='border:0'><h3><a target=\"_blank\" style=\"color: blue\" href=\"{{link}}\">{{title}}</a></h3>\n{{{content:h4}}}</td>\n<td rowspan=2 style='border:0' width=200px>\n<div style='max-width: 100%; display: inline; height: auto '><img width=200px src=\"{{content:img-src}}\"></div></td>\n</tr>\n<tr>\n<td style='border:0'><b>{{date pubDate 'MMM, DD YYYY'}} by {{dc:creator}}</b></td>\n</table>",
+        "content": "<table width=100% style='border:0'>\n<tr>\n<td style='border:0'><h3><a target=\"_blank\" style=\"color: blue\" href=\"{{link}}\">{{title}}</a></h3>\n{{{content:h4}}}</td>\n<td rowspan=2 style='border:0' width=200px>\n<div style='max-width: 100%; display: inline; height: auto '><img width=200px src=\"{{media:group:media:thumbnail:url}}\"></div></td>\n</tr>\n<tr>\n<td style='border:0'><b>{{date updated 'MMM, DD YYYY'}} by {{author}}</b></td>\n</table>",
         "defaultContent": "The query didn't return any results.",
         "everyRow": true
       },
@@ -50,24 +49,24 @@
         {
           "datasource": {
             "type": "volkovlabs-rss-datasource",
-            "uid": "rZAdZdf7a"
+            "uid": "rZAdZdf82"
           },
-          "dateField": "pubDate",
+          "dateField": "",
           "feedType": "items",
           "queryText": "test",
           "refId": "A"
         }
       ],
-      "title": "News",
+      "title": "YouTube",
       "transformations": [
         {
           "id": "convertFieldType",
           "options": {
             "conversions": [
               {
-                "dateFormat": "ddd, DD MMM YYYY HH:mm:ss ZZ",
+                "dateFormat": "",
                 "destinationType": "time",
-                "targetField": "pubDate"
+                "targetField": "updated"
               }
             ],
             "fields": {}
@@ -79,17 +78,17 @@
     {
       "datasource": {
         "type": "volkovlabs-rss-datasource",
-        "uid": "rZAdZdf82"
+        "uid": "rZAdZdf7a"
       },
       "gridPos": {
         "h": 37,
         "w": 12,
         "x": 12,
         "y": 0
       },
-      "id": 3,
+      "id": 2,
       "options": {
-        "content": "<table width=100% style='border:0'>\n<tr>\n<td style='border:0'><h3><a target=\"_blank\" style=\"color: blue\" href=\"{{link}}\">{{title}}</a></h3>\n{{{content:h4}}}</td>\n<td rowspan=2 style='border:0' width=200px>\n<div style='max-width: 100%; display: inline; height: auto '><img width=200px src=\"{{media:group:media:thumbnail:url}}\"></div></td>\n</tr>\n<tr>\n<td style='border:0'><b>{{date updated 'MMM, DD YYYY'}} by {{author}}</b></td>\n</table>",
+        "content": "<table width=100% style='border:0'>\n<tr>\n<td style='border:0'><h3><a target=\"_blank\" style=\"color: blue\" href=\"{{link}}\">{{title}}</a></h3>\n{{{content:h4}}}</td>\n<td rowspan=2 style='border:0' width=200px>\n<div style='max-width: 100%; display: inline; height: auto '><img width=200px src=\"{{content:img-src}}\"></div></td>\n</tr>\n<tr>\n<td style='border:0'><b>{{date pubDate 'MMM, DD YYYY'}} by {{dc:creator}}</b></td>\n</table>",
         "defaultContent": "The query didn't return any results.",
         "everyRow": true
       },
@@ -98,24 +97,24 @@
         {
           "datasource": {
             "type": "volkovlabs-rss-datasource",
-            "uid": "rZAdZdf82"
+            "uid": "rZAdZdf7a"
           },
-          "dateField": "",
+          "dateField": "pubDate",
           "feedType": "items",
           "queryText": "test",
           "refId": "A"
         }
       ],
-      "title": "YouTube",
+      "title": "Blog",
       "transformations": [
         {
           "id": "convertFieldType",
           "options": {
             "conversions": [
               {
-                "dateFormat": "",
+                "dateFormat": "ddd, DD MMM YYYY HH:mm:ss ZZ",
                 "destinationType": "time",
-                "targetField": "updated"
+                "targetField": "pubDate"
               }
             ],
             "fields": {}

diff --git a/provisioning/datasources/datasource.yaml b/provisioning/datasources/datasource.yaml
@@ -4,7 +4,6 @@ datasources:
   - name: Volkov Labs RSS
     type: volkovlabs-rss-datasource
     access: proxy
-    isDefault: true
     uid: rZAdZdf7a
     orgId: 1
     version: 1

diff --git a/src/components/Plugins/ApacheECharts.tsx b/src/components/Plugins/ApacheECharts.tsx
@@ -75,6 +75,9 @@ export class ApacheECharts extends PureComponent {
           >
             Grafana
           </LinkButton>
+          <LinkButton variant="success" icon="building" target="_blank" href="https://echarts.volkovlabs.io">
+            Examples
+          </LinkButton>
         </Card.Actions>
       </Card>
     );

diff --git a/src/plugin.json b/src/plugin.json
@@ -35,11 +35,18 @@
     "version": "%VERSION%"
   },
   "includes": [
+    {
+      "addToNav": true,
+      "name": "News",
+      "path": "/d/O4tc_E6Gz",
+      "role": "Viewer",
+      "type": "page"
+    },
     {
       "addToNav": true,
       "defaultNav": true,
       "icon": "home-alt",
-      "name": "Home",
+      "name": "Plugins",
       "path": "/a/volkovlabs-app/",
       "role": "Viewer",
       "type": "page"