Skip to content

Commit

Permalink
feat(*): Upgrade Grafana to v11.3.0 (#287)
Browse files Browse the repository at this point in the history
* Upgrade to grafana 11.3.0

* Update screenshots

* Degrade plugin info gracefully

* Revert react-router change

* Add correct version of react-router to package.json
  • Loading branch information
ifrost authored Nov 21, 2024
1 parent bb209c3 commit 595a1cc
Show file tree
Hide file tree
Showing 38 changed files with 459 additions and 364 deletions.
2 changes: 1 addition & 1 deletion docker-compose.e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
context: ./.config
args:
grafana_image: ${GRAFANA_IMAGE:-grafana-enterprise}
grafana_version: ${GRAFANA_VERSION:-11.2.0}
grafana_version: ${GRAFANA_VERSION:-11.3.0}
ports:
- ${GRAFANA_PORT:-3000}:3000/tcp
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
context: ./.config
args:
grafana_image: ${GRAFANA_IMAGE:-grafana-enterprise}
grafana_version: ${GRAFANA_VERSION:-11.2.0}
grafana_version: ${GRAFANA_VERSION:-11.3.0}
ports:
- ${GRAFANA_PORT:-3000}:3000/tcp
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.remote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
dockerfile: ./Dockerfile.remote
args:
grafana_image: ${GRAFANA_IMAGE:-grafana-enterprise}
grafana_version: ${GRAFANA_VERSION:-11.2.0}
grafana_version: ${GRAFANA_VERSION:-11.3.0}
backendUrl: ${REMOTE_BACKEND_URL}
basicAuthUser: ${REMOTE_BASIC_AUTH_USER}
basicAuthPassword: ${REMOTE_BASIC_AUTH_PASSWORD}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
context: ./.config
args:
grafana_image: ${GRAFANA_IMAGE:-grafana-enterprise}
grafana_version: ${GRAFANA_VERSION:-11.2.0}
grafana_version: ${GRAFANA_VERSION:-11.3.0}
ports:
- ${GRAFANA_PORT:-3000}:3000/tcp
volumes:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
},
"dependencies": {
"@emotion/css": "^11.1.3",
"@grafana/data": "11.2.0",
"@grafana/data": "11.3.0",
"@grafana/faro-web-sdk": "^1.10.0",
"@grafana/flamegraph": "11.2.0",
"@grafana/flamegraph": "11.3.0",
"@grafana/llm": "^0.10.7",
"@grafana/runtime": "11.2.0",
"@grafana/runtime": "11.3.0",
"@grafana/scenes": "^4.22.0",
"@grafana/schema": "11.2.0",
"@grafana/ui": "11.2.0",
"@grafana/schema": "11.3.0",
"@grafana/ui": "11.3.0",
"@react-aria/utils": "^3.25.3",
"@tanstack/react-query": "^5.17.19",
"color": "^4.2.3",
Expand All @@ -58,7 +58,8 @@
"react-dom": "18.2.0",
"react-helmet": "^6.1.0",
"react-inlinesvg": "^4.1.3",
"react-router-dom": "^5.2.0",
"react-router": "^5.3.3",
"react-router-dom": "^5.3.3",
"rxjs": "7.8.0",
"xstate": "^4.38.3"
},
Expand Down
2 changes: 1 addition & 1 deletion src/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"autoEnabled": true,
"backend": false,
"dependencies": {
"grafanaDependency": ">=11.2.0",
"grafanaDependency": ">=11.3.0",
"plugins": []
},
"info": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jest.mock('@grafana/runtime', () => ({
},
},
buildInfo: {
version: '11.2.0',
version: '11.3.0',
edition: 'Enterprise',
},
},
Expand Down Expand Up @@ -123,7 +123,7 @@ describe('initFaro()', () => {
release: 'v0.01-test',
version: GIT_COMMIT,
environment: 'prod',
namespace: 'v11.2.0 (Enterprise)',
namespace: 'v11.3.0 (Enterprise)',
});

expect(user).toStrictEqual({ email: '[email protected]' });
Expand Down
2 changes: 1 addition & 1 deletion src/shared/ui/PluginInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function InfoMenuHeader() {
meta: {
info: { version, updated },
},
} = usePluginContext();
} = usePluginContext() || { meta: { info: { version: '?.?.?', updated: '?' } } };

return (
<div className={styles.menuHeader}>
Expand Down
Loading

1 comment on commit 595a1cc

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unit test coverage

Lines Statements Branches Functions
Coverage: 13%
13.61% (543/3988) 10.39% (147/1414) 9.89% (125/1263)

Please sign in to comment.