Update dashboards in the application's menu as pages

RedisGrafana · Jun 18, 2021 · 6590cfe · 6590cfe
1 parent 2429018
commit 6590cfe
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,20 @@
 
 ## 2.0.0 (IN PROGRESS)
 
+### Features / Enhancements
+
+- Upgrade to Grafana 8.0.2 (#67)
+- Update dashboards for v8 and minor updates (#69)
+- Replace old Latency Graph with TimeSeries component (#70)
+- Add Redis 7 commands to CLI (#71)
+- Add NgAlert and Plugin catalog to docker image (#72)
+
 ### Bug fixes
 
 - "Available Requirements" panel should be set to $redis datasource #63
 - Cannot read property 'v1' of undefined (theme.v1) in the Grafana8 #65
-- Upgrade to Grafana 8.0.2 (#67)
+- Add theme to getDisplayProcessor (#66)
+- Fix adding new data source and minor updates (#68)
 
 ## 1.2.0 (2021-05-11)
 

diff --git a/src/components/config/config.tsx b/src/components/config/config.tsx
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { AppPluginMeta, PluginConfigPageProps } from '@grafana/data';
 import { BackendSrv, getBackendSrv, getLocationSrv } from '@grafana/runtime';
 import { Button } from '@grafana/ui';
-import { ApplicationRoot } from '../../constants';
+import { ApplicationName, ApplicationRoot } from '../../constants';
 import { GlobalSettings } from '../../types';
 
 /**
@@ -100,7 +100,7 @@ export class Config extends PureComponent<Props, State> {
 
     return (
       <>
-        <h2>Redis Application</h2>
+        <h2>{ApplicationName}</h2>
         <p>The Redis Application, is a plugin for Grafana that provides custom panels for Redis Data Source.</p>
         {!isEnabled && (
           <p>

diff --git a/src/components/root-page/root-page.test.tsx b/src/components/root-page/root-page.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { Observable } from 'rxjs';
 import { AppPluginMeta, PluginType } from '@grafana/data';
 import { Alert } from '@grafana/ui';
-import { DataSourceType, RedisCommand } from '../../constants';
+import { ApplicationName, DataSourceType, RedisCommand } from '../../constants';
 import { DataSourceList } from '../data-source-list';
 import { RootPage } from './root-page';
 
@@ -161,7 +161,7 @@ describe('RootPage', () => {
       );
       wrapper.instance().updateNav();
       const node = {
-        text: 'Redis Application',
+        text: ApplicationName,
         img: meta.info.logos.large,
         subTitle: 'Redis Data Source',
         url: path,

diff --git a/src/components/root-page/root-page.tsx b/src/components/root-page/root-page.tsx
@@ -10,7 +10,7 @@ import {
 } from '@grafana/data';
 import { config, getBackendSrv, getDataSourceSrv } from '@grafana/runtime';
 import { Alert } from '@grafana/ui';
-import { DataSourceType, RedisCommand } from '../../constants';
+import { ApplicationName, DataSourceType, RedisCommand } from '../../constants';
 import { RedisQuery } from '../../redis-cli-panel/types';
 import { GlobalSettings, RedisDataSourceInstanceSettings } from '../../types';
 import { DataSourceList } from '../data-source-list';
@@ -165,7 +165,7 @@ export class RootPage extends PureComponent<Props, State> {
      * Header
      */
     const node = {
-      text: 'Redis Application',
+      text: ApplicationName,
       img: meta.info.logos.large,
       subTitle: 'Redis Data Source',
       url: path,

diff --git a/src/constants.ts b/src/constants.ts
@@ -40,3 +40,8 @@ export enum ClientTypeValue {
  * Application root page
  */
 export const ApplicationRoot = '/a/redis-app';
+
+/**
+ * Application's name
+ */
+export const ApplicationName = 'Redis Application';
diff --git a/src/plugin.json b/src/plugin.json
@@ -23,28 +23,49 @@
       "type": "page"
     },
     {
-      "addToNav": true,
+      "addToNav": false,
+      "name": "Redis Overview",
+      "path": "dashboards/redis-overview.json",
+      "role": "Admin",
+      "type": "dashboard"
+    },
+    {
+      "addToNav": false,
       "name": "Redis CLI",
-      "icon": "calculator-alt",
       "path": "dashboards/redis-cli.json",
       "role": "Admin",
       "type": "dashboard"
     },
+    {
+      "addToNav": false,
+      "name": "RedisGears",
+      "path": "dashboards/redis-gears.json",
+      "role": "Admin",
+      "type": "dashboard"
+    },
     {
       "addToNav": true,
       "name": "Redis Overview",
       "icon": "monitor",
-      "path": "dashboards/redis-overview.json",
+      "path": "/d/RpSjVqWMz",
       "role": "Admin",
-      "type": "dashboard"
+      "type": "page"
+    },
+    {
+      "addToNav": true,
+      "name": "Redis CLI",
+      "icon": "calculator-alt",
+      "path": "/d/_SGxCBNGk",
+      "role": "Admin",
+      "type": "page"
     },
     {
       "addToNav": true,
       "name": "RedisGears",
       "icon": "cog",
-      "path": "dashboards/redis-gears.json",
+      "path": "/d/xFPiNzLMz",
       "role": "Admin",
-      "type": "dashboard"
+      "type": "page"
     },
     {
       "name": "Redis CLI Panel",