Skip to content

Commit

Permalink
Update to Grafana 11.3.0 image (#115)
Browse files Browse the repository at this point in the history
* Update to Grafana 11.3.0 image

* Update graphics

* Update E2E
  • Loading branch information
mikhail-vl authored Oct 23, 2024
1 parent a5b60b7 commit 8ad100a
Show file tree
Hide file tree
Showing 8 changed files with 280 additions and 278 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

## 4.4.0 (2024-10-22)

### Features / Enhancements

- Updated to Grafana 11.3.0 image (#111)

## 4.3.0 (2024-08-27)

### Features / Enhancements
Expand Down
11 changes: 3 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/grafana-oss:11.2.0
FROM grafana/grafana-oss:11.3.0

##################################################################
## CONFIGURATION
Expand All @@ -18,9 +18,6 @@ ENV GF_PANELS_DISABLE_SANITIZE_HTML=true
## Check for Updates
ENV GF_ANALYTICS_CHECK_FOR_UPDATES=false

## Scenes-engine Dashboards
# ENV GF_FEATURE_TOGGLES_ENABLE=dashboardScene

## Set Home Dashboard
ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/business.json

Expand Down Expand Up @@ -75,14 +72,12 @@ RUN sed -i 's|Loading Grafana|Loading Business App|g' /usr/share/grafana/public/
RUN sed -i "s|\[\[.NavTree\]\],|nav,|g; \
s|window.grafanaBootData = {| \
let nav = [[.NavTree]]; \
const alerting = nav.find((element) => element.id === 'alerting'); \
if (alerting) { alerting['url'] = '/alerting/list'; } \
const dashboards = nav.find((element) => element.id === 'dashboards/browse'); \
if (dashboards) { dashboards['children'] = [];} \
const connections = nav.find((element) => element.id === 'connections'); \
if (connections) { connections['url'] = '/datasources'; connections['children'].shift(); } \
const help = nav.find((element) => element.id === 'help'); \
if (help) { help['subTitle'] = 'Business App 4.3.0'; help['children'] = [];} \
if (help) { help['subTitle'] = 'Business App 4.4.0'; help['children'] = [];} \
window.grafanaBootData = {|g" \
/usr/share/grafana/public/views/index.html

Expand All @@ -104,7 +99,7 @@ RUN find /usr/share/grafana/public/build/ -name *.js \
## Remove Edition in the Footer
-exec sed -i 's|({target:"_blank",id:"license",.*licenseUrl})|()|g' {} \; \
## Remove Version in the Footer
-exec sed -i 's|({target:"_blank",id:"version",.*CHANGELOG.md":void 0})|()|g' {} \; \
-exec sed -i 's|({target:"_blank",id:"version",text:f.versionString,url:D?"https://github.com/grafana/grafana/blob/main/CHANGELOG.md":void 0})|()|g' {} \; \
## Remove News icon
-exec sed -i 's|(.,.....)(....,{className:.,onClick:.,iconOnly:!0,icon:"rss","aria-label":"News"})|null|g' {} \; \
## Remove Open Source icon
Expand Down
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![App](https://raw.githubusercontent.com/volkovlabs/business-app/main/img/app.png)

![Grafana](https://img.shields.io/badge/Grafana-11.2-orange)
![Grafana](https://img.shields.io/badge/Grafana-11.3-orange)
[![YouTube](https://img.shields.io/badge/YouTube-Channel-red)](https://youtube.com/@volkovlabs)
![CI](https://github.com/volkovlabs/business-app/workflows/CI/badge.svg)
![E2E](https://github.com/volkovlabs/business-app/workflows/E2E/badge.svg)
Expand Down Expand Up @@ -35,13 +35,16 @@ The collection aims to solve the most frequent business tasks by providing an in

[![Business Suite for Grafana](https://raw.githubusercontent.com/VolkovLabs/.github/main/business.png)](https://volkovlabs.io/plugins/)

## Feedback
### Enterprise Support

We're looking forward to hearing from you. You can use different ways to get in touch with us.
With the [Business Suite Enterprise](https://volkovlabs.io/pricing/), you're not just getting a product, you're getting a complete support system. You'll have a designated support team ready to tackle any issues.

- Subscribe to our [YouTube Channel](https://www.youtube.com/@volkovlabs) and leave your comments.
- Sponsor our open-source plugins for Grafana at [GitHub Sponsor](https://github.com/sponsors/VolkovLabs).
- Support our project by starring the repository.
You can contact us via Zendesk, receive priority in feature requests and bug fixes, meet with us for in-person consultation, and get access to the Business Intelligence. It's a package that's designed to make your life easier.

## Always happy to hear from you

- Subscribe to our [YouTube Channel](https://youtube.com/@volkovlabs) and leave your comments.
- Become a [Business Suite sponsor](https://github.com/sponsors/VolkovLabs).

## License

Expand Down
493 changes: 239 additions & 254 deletions img/background.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/fav32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 20 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"devDependencies": {
"@babel/core": "^7.25.2",
"@grafana/eslint-config": "^7.0.0",
"@grafana/plugin-e2e": "^1.7.1",
"@grafana/plugin-e2e": "^1.9.0",
"@grafana/tsconfig": "^2.0.0",
"@playwright/test": "^1.46.1",
"@swc/core": "^1.7.18",
Expand Down Expand Up @@ -73,5 +73,5 @@
"test:ci": "jest --maxWorkers 4 --coverage",
"upgrade": "npm upgrade --save"
},
"version": "4.3.0"
"version": "4.4.0"
}
2 changes: 1 addition & 1 deletion provisioning/dashboards/business.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"fixed": "transparent"
},
"image": {
"fixed": "https://volkovlabs.io/img/honeycomb.png",
"fixed": "https://volkovlabs.io/img/suite.png",
"mode": "fixed"
},
"size": "cover"
Expand Down

0 comments on commit 8ad100a

Please sign in to comment.