diff --git a/README.md b/README.md index dc3e0b0bc..0414eeebd 100644 --- a/README.md +++ b/README.md @@ -791,10 +791,10 @@ SOFTWARE. [glances-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg [glances-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg [glances-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg -[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/50f050d -[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/50f050d/README.md +[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/14b54f8 +[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/14b54f8/README.md [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues -[grafana-version-shield]: https://img.shields.io/badge/version-50f050d-blue.svg +[grafana-version-shield]: https://img.shields.io/badge/version-14b54f8-blue.svg [grafana-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [grafana-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg [grafana-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg diff --git a/grafana/CHANGELOG.md b/grafana/CHANGELOG.md index df40a4635..6f9a1554e 100644 --- a/grafana/CHANGELOG.md +++ b/grafana/CHANGELOG.md @@ -1,4 +1,6 @@ # Changelog since v7.2.0 +- Migrate JSON config to YAML (#225) +- Switch to centralized GitHub Action Workflows (#224) - ⬆️ Bump actions/checkout from 2.3.4 to 2.3.5 (#218) Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5. @@ -18,7 +20,7 @@ Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - ⬆️ Upgrades add-on base image to 5.1.1 (#216) - ⬆️ Upgrades Grafana to v8.1.7 (#217) -- ⬆ Upgrade lock-threads workflow to 3.0.0 (#215) +- ⬆️ Upgrade lock-threads workflow to 3.0.0 (#215) - ⬆️ Bump frenck/action-addon-linter from 2.3 to 2.4.1 (#214) Bumps [frenck/action-addon-linter](https://github.com/frenck/action-addon-linter) from 2.3 to 2.4.1. diff --git a/grafana/README.md b/grafana/README.md index 62800c60c..88e0deefb 100644 --- a/grafana/README.md +++ b/grafana/README.md @@ -53,6 +53,6 @@ If you are more interested in stable releases of our add-ons: [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png [patreon]: https://www.patreon.com/frenck [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg -[release-shield]: https://img.shields.io/badge/version-50f050d-blue.svg -[release]: https://github.com/hassio-addons/addon-grafana/tree/50f050d +[release-shield]: https://img.shields.io/badge/version-14b54f8-blue.svg +[release]: https://github.com/hassio-addons/addon-grafana/tree/14b54f8 [screenshot]: https://github.com/hassio-addons/addon-grafana/raw/main/images/screenshot.png \ No newline at end of file diff --git a/grafana/config.json b/grafana/config.json deleted file mode 100644 index 6ca864236..000000000 --- a/grafana/config.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "Grafana", - "version": "50f050d", - "slug": "grafana", - "description": "The open platform for beautiful analytics and monitoring", - "url": "https://github.com/hassio-addons/addon-grafana", - "startup": "services", - "ingress": true, - "ingress_port": 1337, - "ingress_stream": true, - "panel_icon": "mdi:chart-timeline", - "panel_title": "Grafana", - "arch": [ - "aarch64", - "amd64", - "armv7" - ], - "map": [ - "config", - "ssl" - ], - "watchdog": "http://[HOST]:1337/api/health", - "options": { - "plugins": [], - "env_vars": [], - "ssl": true, - "certfile": "fullchain.pem", - "keyfile": "privkey.pem" - }, - "ports": { - "80/tcp": null - }, - "ports_description": { - "80/tcp": "Not required for Ingress" - }, - "schema": { - "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", - "plugins": [ - "str" - ], - "certfile": "str", - "keyfile": "str", - "ssl": "bool", - "grafana_ingress_user": "str?", - "env_vars": [ - { - "name": "match(^GF_([A-Z0-9_])+$)", - "value": "str" - } - ] - }, - "image": "ghcr.io/hassio-addons/grafana/{arch}" -} \ No newline at end of file diff --git a/grafana/config.yaml b/grafana/config.yaml new file mode 100644 index 000000000..050aecb18 --- /dev/null +++ b/grafana/config.yaml @@ -0,0 +1,41 @@ +arch: +- aarch64 +- amd64 +- armv7 +description: The open platform for beautiful analytics and monitoring +image: ghcr.io/hassio-addons/grafana/{arch} +ingress: true +ingress_port: 1337 +ingress_stream: true +map: +- config +- ssl +name: Grafana +options: + certfile: fullchain.pem + env_vars: [] + keyfile: privkey.pem + plugins: [] + ssl: true +panel_icon: mdi:chart-timeline +panel_title: Grafana +ports: + 80/tcp: null +ports_description: + 80/tcp: Not required for Ingress +schema: + certfile: str + env_vars: + - name: match(^GF_([A-Z0-9_])+$) + value: str + grafana_ingress_user: str? + keyfile: str + log_level: list(trace|debug|info|notice|warning|error|fatal)? + plugins: + - str + ssl: bool +slug: grafana +startup: services +url: https://github.com/hassio-addons/addon-grafana +version: 14b54f8 +watchdog: http://[HOST]:1337/api/health