Skip to content

Commit

Permalink
Update to Grafana 11.3 and dependencies (#80)
Browse files Browse the repository at this point in the history
* Update to Grafana 11.3 and dependencies

* Fix lint
  • Loading branch information
mikhail-vl authored Nov 18, 2024
1 parent 658da39 commit 3073663
Show file tree
Hide file tree
Showing 13 changed files with 2,937 additions and 4,220 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 3.3.0 (2024-11-17)

### Features / Enhancements

- Updated to Grafana 11.3 and dependencies (#80)

## 3.2.0 (2024-07-29)

### Breaking changes
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![Datasource](https://github.com/VolkovLabs/business-satellite/raw/main/src/img/datasource.png)

![Grafana](https://img.shields.io/badge/Grafana-11.1-orange)
![Grafana](https://img.shields.io/badge/Grafana-11.3-orange)
![CI](https://github.com/volkovlabs/business-satellite/workflows/CI/badge.svg)
![E2E](https://github.com/volkovlabs/business-satellite/workflows/E2E/badge.svg)
[![codecov](https://codecov.io/gh/VolkovLabs/business-satellite/branch/main/graph/badge.svg)](https://codecov.io/gh/VolkovLabs/business-satellite)
Expand All @@ -27,9 +27,11 @@ The Business Satellite Data Source can be installed from the [Grafana Catalog](h
For the latter, use the following command.

```bash
grafana-cli plugins install volkovlabs-grapi-datasource
grafana cli plugins install volkovlabs-grapi-datasource
```

[![Install Business Suite plugins in Cloud, OSS, Enterprise | Open source community plugins](https://raw.githubusercontent.com/volkovlabs/.github/main/started.png)](https://youtu.be/1qYzHfPXJF8)

### Authentication

The Business Satellite Data Source requires a Grafana URL and a Token or API key to establish the connection to the organization and get relevant data.
Expand Down
7,063 changes: 2,883 additions & 4,180 deletions package-lock.json

Large diffs are not rendered by default.

57 changes: 28 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,55 @@
"author": "Volkov Labs",
"dependencies": {
"@emotion/css": "^11.11.2",
"@grafana/data": "^11.1.0",
"@grafana/runtime": "^11.1.0",
"@grafana/schema": "^11.1.0",
"@grafana/ui": "^11.1.0",
"@volkovlabs/components": "^2.7.1",
"compare-versions": "^6.1.0",
"@grafana/data": "^11.3.0",
"@grafana/runtime": "^11.3.0",
"@grafana/schema": "^11.3.0",
"@grafana/ui": "^11.3.0",
"@volkovlabs/components": "^3.5.0",
"compare-versions": "^6.1.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"tslib": "^2.6.3"
"tslib": "^2.8.1"
},
"description": "Connect to Local and Remote Grafana instances",
"devDependencies": {
"@babel/core": "^7.24.8",
"@grafana/eslint-config": "^7.0.0",
"@grafana/plugin-e2e": "^1.6.1",
"@grafana/tsconfig": "^1.3.0-rc1",
"@playwright/test": "^1.45.1",
"@swc/core": "^1.6.13",
"@swc/helpers": "^0.5.11",
"@swc/jest": "^0.2.36",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/react": "^15.0.7",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.17.6",
"@types/node": "^20.14.10",
"@babel/core": "^7.26.0",
"@grafana/eslint-config": "^8.0.0",
"@grafana/plugin-e2e": "^1.12.1",
"@grafana/tsconfig": "^2.0.0",
"@playwright/test": "^1.48.2",
"@swc/core": "^1.9.2",
"@swc/helpers": "^0.5.15",
"@swc/jest": "^0.2.37",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@types/jest": "^29.5.14",
"@types/lodash": "^4.17.13",
"@types/node": "^22.9.0",
"@types/webpack-env": "^1.18.5",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@volkovlabs/eslint-config": "^1.3.0",
"@volkovlabs/jest-selectors": "^1.4.1",
"@volkovlabs/jest-selectors": "^1.5.0",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^7.1.2",
"eslint-plugin-deprecation": "^3.0.0",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react": "^7.37.2",
"eslint-webpack-plugin": "^4.2.0",
"fork-ts-checker-webpack-plugin": "^9.0.2",
"glob": "^11.0.0",
"identity-obj-proxy": "3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"replace-in-file-webpack-plugin": "^1.0.6",
"sass": "^1.77.8",
"sass-loader": "^14.2.1",
"sass": "^1.81.0",
"sass-loader": "^16.0.3",
"style-loader": "^4.0.0",
"swc-loader": "^0.2.6",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "5.5.3",
"typescript": "5.6.3",
"util": "^0.12.5",
"webpack": "^5.93.0",
"webpack": "^5.96.1",
"webpack-cli": "^5.1.4",
"webpack-livereload-plugin": "^3.0.2"
},
Expand All @@ -78,5 +77,5 @@
"test:ci": "jest --maxWorkers 4 --coverage",
"upgrade": "npm upgrade --force --save"
},
"version": "3.2.0"
"version": "3.3.0"
}
7 changes: 7 additions & 0 deletions src/__mocks__/@grafana/scenes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Mock @grafana/scenes
* mostly prevent IntersectionObserver is not defined
*/
jest.mock('@grafana/scenes', () => ({
sceneGraph: {},
}));
2 changes: 1 addition & 1 deletion src/api/alerting.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ describe('Alerting Api', () => {
try {
const result = await api.features.alerting.getAlerts(alertingQuery);
expect(result).toThrow(TypeError);
} catch (e) {}
} catch {}
});

it('Should return dataFrame', async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/api/annotations.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ describe('Annotations Api', () => {
try {
const result = await api.features.annotations.getAll(query, range, '', {});
expect(result).toThrow(TypeError);
} catch (e) {}
} catch {}
});

it('Should make getAnnotationsFrame request', async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/api/dashboards.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ describe('Dashboards Api', () => {
try {
const result = await api.features.dashboards.getAllMeta();
expect(result).toThrow(TypeError);
} catch (e) {}
} catch {}
});

it('Should return dataFrame', async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/api/datasources.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ describe('Data Sources Api', () => {
try {
const result = await api.features.datasources.getAll();
expect(result).toThrow(TypeError);
} catch (e) {}
} catch {}
});

it('Should make getDataSourcesFrame request', async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/api/health.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ describe('Health Api', () => {
try {
const result = await api.features.health.get();
expect(result).toThrow(TypeError);
} catch (e) {}
} catch {}
});

it('Should make getHealthFrame request', async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/api/org.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ describe('Org Api', () => {
try {
const result = await api.features.org.get();
expect(result).toThrow(TypeError);
} catch (e) {}
} catch {}
});
});

Expand Down Expand Up @@ -171,7 +171,7 @@ describe('Org Api', () => {
try {
const result = await api.features.org.getUsers();
expect(result).toThrow(TypeError);
} catch (e) {}
} catch {}
});

it('Should make getUsersFrame request', async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/api/provisioning.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ describe('Provisioning Api', () => {
try {
const result = await api.features.provisioning.getAlertRules();
expect(result).toThrow(TypeError);
} catch (e) {}
} catch {}
});

it('Should make getAlertRulesFrame request', async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ConfigEditor/ConfigEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { DataSourceOptions, RequestMode, SecureJsonData } from '../../types';
/**
* Editor Properties
*/
interface Props extends DataSourcePluginOptionsEditorProps<DataSourceOptions, SecureJsonData> {}
type Props = DataSourcePluginOptionsEditorProps<DataSourceOptions>;

/**
* Config Editor
Expand Down

0 comments on commit 3073663

Please sign in to comment.