diff --git a/CHANGELOG.md b/CHANGELOG.md index a785674..86b1eef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Dockerfile b/Dockerfile index afefd25..4ef948e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM grafana/grafana-oss:11.2.0 +FROM grafana/grafana-oss:11.3.0 ################################################################## ## CONFIGURATION @@ -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 @@ -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 @@ -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 diff --git a/README.md b/README.md index 942ed46..f421fd4 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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 diff --git a/img/background.svg b/img/background.svg index 960bfcc..fffec0f 100644 --- a/img/background.svg +++ b/img/background.svg @@ -1,258 +1,243 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/img/fav32.png b/img/fav32.png index 0f947c6..8039add 100644 Binary files a/img/fav32.png and b/img/fav32.png differ diff --git a/package-lock.json b/package-lock.json index 33b5f2b..1bdebfb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "business-suite", - "version": "4.3.0", + "version": "4.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "business-suite", - "version": "4.3.0", + "version": "4.4.0", "license": "Apache-2.0", "dependencies": { "@emotion/css": "^11.13.0", @@ -21,7 +21,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", @@ -1562,13 +1562,13 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", - "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.9.0.tgz", + "integrity": "sha512-FQpSZFyapurOwLa++6jV55Ok7pK6yQ/mERj5E7tHtWZIeKTkttYeQVFeHSztFdsHFIxE3QubfuEu1p68ixEEJQ==", "dev": true, "dependencies": { "semver": "^7.5.4", - "uuid": "^9.0.1", + "uuid": "^10.0.0", "yaml": "^2.3.4" }, "engines": { @@ -1590,6 +1590,19 @@ "node": ">=10" } }, + "node_modules/@grafana/plugin-e2e/node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@grafana/runtime": { "version": "11.2.0", "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.2.0.tgz", diff --git a/package.json b/package.json index de21beb..976da11 100644 --- a/package.json +++ b/package.json @@ -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", @@ -73,5 +73,5 @@ "test:ci": "jest --maxWorkers 4 --coverage", "upgrade": "npm upgrade --save" }, - "version": "4.3.0" + "version": "4.4.0" } diff --git a/provisioning/dashboards/business.json b/provisioning/dashboards/business.json index e3dda5b..4ec1fd4 100644 --- a/provisioning/dashboards/business.json +++ b/provisioning/dashboards/business.json @@ -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"