Update README, CHANGELOG for version 2.0.0 (#60)

RedisGrafana · Jun 24, 2021 · a8bc61f · a8bc61f
1 parent b454f3a
commit a8bc61f
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,18 @@
 # Change Log
 
-## 2.0.0 (IN PROGRESS)
+## 2.0.0 (2021-06-24)
+
+### Breaking changes
+
+Supports Grafana 8.0+, for Grafana 7.X use version 1.1.0
 
 ### Features / Enhancements
 
+- Update Readme to add official Grafana repository (#52)
 - Upgrade to Grafana 8.0.1 (#53)
+- Update dashboards and screenshots for Grafana 8 (#55)
+- Add NgAlert and Plugin Catalog to Docker image with minor doc updates (#58)
+- Update dashboards in the application's menu as pages (#59)
 
 ## 1.1.0 (2021-04-29)
 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![Dashboard](https://raw.githubusercontent.com/RedisGrafana/grafana-redis-explorer/master/src/img/overview.png)
 
-[![Grafana 7](https://img.shields.io/badge/Grafana-7-orange)](https://www.grafana.com)
+[![Grafana 8](https://img.shields.io/badge/Grafana-8-orange)](https://www.grafana.com)
 [![Redis Explorer plugin](https://img.shields.io/badge/dynamic/json?color=blue&label=Redis%20Explorer%20plugin&query=%24.version&url=https%3A%2F%2Fgrafana.com%2Fapi%2Fplugins%2Fredis-explorer-app)](https://grafana.com/grafana/plugins/redis-explorer-app)
 ![CI](https://github.com/RedisGrafana/grafana-redis-explorer/workflows/CI/badge.svg)
 ![Docker](https://github.com/RedisGrafana/grafana-redis-explorer/workflows/Docker/badge.svg)
@@ -25,7 +25,7 @@ The Redis Explorer is a plugin for Grafana that connects to Redis Enterprise sof
 
 ### Requirements
 
-- **Grafana 8.0** is required for Redis Explorer 2.X.
+- **Grafana 8.0+** is required for Redis Explorer 2.X.
 - **Grafana 7.1+** is required for Redis Explorer 1.X.
 
 ### Does this Application require anything special configured on the Redis Enterprise?

diff --git a/src/components/cluster-database/cluster-database.test.tsx b/src/components/cluster-database/cluster-database.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
+import React from 'react';
 import {
   HighAvailability,
   MultiLayerSecurity,
@@ -10,8 +10,8 @@ import {
   RedisJSON,
   RedisSearch,
   RedisTimeSeries,
-} from 'icons';
-import { Bdb, BdbEndpoint } from 'redis-enterprise-software-datasource/api';
+} from '../../icons';
+import { Bdb, BdbEndpoint } from '../../redis-enterprise-software-datasource/api';
 import { ClusterDatabase } from './cluster-database';
 
 type ShallowComponent = ShallowWrapper<ClusterDatabase['props'], ClusterDatabase['state'], ClusterDatabase>;

diff --git a/src/components/cluster-database/cluster-database.tsx b/src/components/cluster-database/cluster-database.tsx
@@ -1,3 +1,6 @@
+import React, { PureComponent } from 'react';
+import { SelectableValue } from '@grafana/data';
+import { Button, Container, HorizontalGroup, InlineFormLabel, Select } from '@grafana/ui';
 import {
   HighAvailability,
   MultiLayerSecurity,
@@ -9,11 +12,8 @@ import {
   RedisJSON,
   RedisSearch,
   RedisTimeSeries,
-} from 'icons';
-import React, { PureComponent } from 'react';
-import { Bdb, BdbEndpoint } from 'redis-enterprise-software-datasource/api';
-import { SelectableValue } from '@grafana/data';
-import { Button, Container, HorizontalGroup, InlineFormLabel, Select } from '@grafana/ui';
+} from '../../icons';
+import { Bdb, BdbEndpoint } from '../../redis-enterprise-software-datasource/api';
 import { NewDatasourceOptions } from '../../types';
 
 /**

diff --git a/src/components/cluster-databases/cluster-databases.test.tsx b/src/components/cluster-databases/cluster-databases.test.tsx
@@ -1,6 +1,6 @@
 import { shallow } from 'enzyme';
 import React from 'react';
-import { Bdb, QueryTypeValue } from 'redis-enterprise-software-datasource/api';
+import { Bdb, QueryTypeValue } from '../../redis-enterprise-software-datasource/api';
 import { ClusterDatabase } from '../cluster-database';
 import { ClusterDatabases } from './cluster-databases';
 

diff --git a/src/components/cluster-databases/cluster-databases.tsx b/src/components/cluster-databases/cluster-databases.tsx
@@ -1,10 +1,9 @@
 import React, { PureComponent } from 'react';
-import { Bdb, QueryTypeValue } from 'redis-enterprise-software-datasource/api';
-import { EnterpriseDataSourceInstanceSettings } from 'types';
 import { css } from '@emotion/css';
 import { DataSourceInstanceSettings } from '@grafana/data';
 import { BackendSrv, DataSourceSrv, getBackendSrv, getDataSourceSrv } from '@grafana/runtime';
-import { NewDatasourceOptions } from '../../types';
+import { Bdb, QueryTypeValue } from '../../redis-enterprise-software-datasource/api';
+import { EnterpriseDataSourceInstanceSettings, NewDatasourceOptions } from '../../types';
 import { ClusterDatabase } from '../cluster-database';
 
 /**

diff --git a/src/components/data-source-list/data-source-list.tsx b/src/components/data-source-list/data-source-list.tsx
@@ -1,9 +1,9 @@
-import { RedisEnterpriseSoftware } from 'icons';
 import React, { FC, useCallback } from 'react';
-import { EnterpriseDataSourceInstanceSettings } from 'types';
 import { getBackendSrv, locationService } from '@grafana/runtime';
 import { Alert, Button, Container, HorizontalGroup, LinkButton, VerticalGroup } from '@grafana/ui';
 import { ApplicationRoot, DataSourceName, DataSourceType } from '../../constants';
+import { RedisEnterpriseSoftware } from '../../icons';
+import { EnterpriseDataSourceInstanceSettings } from '../../types';
 import { ClusterDatabases } from '../cluster-databases';
 
 /**

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 { AppPluginMeta, FieldType, PluginType, toDataFrame } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { Alert } from '@grafana/ui';
-import { ApplicationName, DataSourceType } from '../../constants';
+import { ApplicationName, ApplicationTitle, DataSourceType } from '../../constants';
 import { QueryTypeValue } from '../../redis-enterprise-software-datasource/api';
 import { DataSourceList } from '../data-source-list';
 import { RootPage } from './root-page';
@@ -188,7 +188,7 @@ describe('RootPage', () => {
       const node = {
         text: ApplicationName,
         img: meta.info.logos.large,
-        subTitle: 'Redis Enterprise clusters',
+        subTitle: ApplicationTitle,
         url: path,
         children: [
           {

diff --git a/src/components/root-page/root-page.tsx b/src/components/root-page/root-page.tsx
@@ -11,7 +11,7 @@ import {
 } from '@grafana/data';
 import { config, getBackendSrv, getDataSourceSrv } from '@grafana/runtime';
 import { Alert } from '@grafana/ui';
-import { ApplicationName, DataSourceType } from '../../constants';
+import { ApplicationName, ApplicationTitle, DataSourceType } from '../../constants';
 import { QueryTypeValue } from '../../redis-enterprise-software-datasource/api';
 import { RedisEnterpriseQuery } from '../../redis-enterprise-software-datasource/types';
 import { EnterpriseDataSourceInstanceSettings, GlobalSettings } from '../../types';
@@ -163,7 +163,7 @@ export class RootPage extends PureComponent<Props, State> {
     const node = {
       text: ApplicationName,
       img: meta.info.logos.large,
-      subTitle: 'Redis Enterprise clusters',
+      subTitle: ApplicationTitle,
       url: path,
       children: tabs,
     };

diff --git a/src/constants.ts b/src/constants.ts
@@ -21,3 +21,8 @@ export const ApplicationRoot = '/a/redis-explorer-app';
  * Application's name
  */
 export const ApplicationName = 'Redis Explorer';
+
+/**
+ * Application's title
+ */
+export const ApplicationTitle = 'Redis Enterprise clusters';