⬆️ Updating add-on Grafana to 5babc5d

README.md

@@ -935,10 +935,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/7df8629
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/5babc5d
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/7df8629/README.md
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/5babc5d/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-7df8629-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-5babc5d-blue.svg
 [grafana-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/grafana-amd64.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/CHANGELOG.md

@@ -1,20 +1,67 @@
 # Changelog since v3.0.2
 
-2020/01/02 22:09 UTC - [7df8629](https://github.com/hassio-addons/addon-grafana/commit/7df8629a820548c91d025c5986e9ce87416bec55) by [@frenck](https://github.com/frenck)
+2020/01/05 10:57 UTC - [5babc5d](https://github.com/hassio-addons/addon-grafana/commit/5babc5d2a03c5291f1b149b9345f86a275c1062d) by [@sinclairpaul](https://github.com/sinclairpaul)
+> 🚑Allow direct access to addon (#62)
+
+* 🔨Add nginx install
+
+* 🔨Add nginx setup
+
+* 🔨Move grafana to 3000
+
+* 🔨Change Ingress Port
+
+* 🔨Add SSL setup
+
+* 🔨Add network port setup
+
+* 🔨Change ingress port back to 3000
+
+* 🔨Remove ingress nginx config
+
+* 🔨Apply nginx config only when exposed
+
+* 🔨Run nginx only when exposed
+
+* 🔨Change redirects to 302
+
+* 🚑Fix typo in nginx SSL config
+
+* 🔨Remove nginx resolver
+
+* 🔨Remove unneeded env vars
+
+* 🔨Place ingress behind nginx again
+
+* 🔨Change grafana to support auth.proxy
+
+* 🔨Configure nginx for user (default admin)
+
+* 🔨Add config item for ingress user
+
+* 🔨Unset header to avoid any injection
+
+* 📚Update Readme with new config option
+
+* 📚Add note on admin user credentials
+
+* 🔨Change default anon to Viewer, will not apply. 
+
+2020/01/05 10:57 UTC - [7df8629](https://github.com/hassio-addons/addon-grafana/commit/7df8629a820548c91d025c5986e9ce87416bec55) by [@frenck](https://github.com/frenck)
 > :pencil2: Fixes some spelling and grammar 
 
-2020/01/02 22:09 UTC - [9409819](https://github.com/hassio-addons/addon-grafana/commit/9409819c40ad98c4aff0ba7bd140743fa60cb5d2) by [@frenck](https://github.com/frenck)
+2020/01/05 10:57 UTC - [9409819](https://github.com/hassio-addons/addon-grafana/commit/9409819c40ad98c4aff0ba7bd140743fa60cb5d2) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades add-on base image to v4.0.3 
 
-2020/01/02 22:09 UTC - [0d831b1](https://github.com/hassio-addons/addon-grafana/commit/0d831b128cad2acd6259635c4e2ed7c86b891ee4) by [@frenck](https://github.com/frenck)
+2020/01/05 10:57 UTC - [0d831b1](https://github.com/hassio-addons/addon-grafana/commit/0d831b128cad2acd6259635c4e2ed7c86b891ee4) by [@frenck](https://github.com/frenck)
 > :pencil2: Funding adjustments 
 
-2020/01/02 22:09 UTC - [ac9b72e](https://github.com/hassio-addons/addon-grafana/commit/ac9b72efad6192dd2bfd5a29644878fa017b195a) by [@frenck](https://github.com/frenck)
+2020/01/05 10:57 UTC - [ac9b72e](https://github.com/hassio-addons/addon-grafana/commit/ac9b72efad6192dd2bfd5a29644878fa017b195a) by [@frenck](https://github.com/frenck)
 > :pencil2: Fixes some spelling and grammar 
 
-2020/01/02 22:09 UTC - [042dadb](https://github.com/hassio-addons/addon-grafana/commit/042dadb841182dad702b446cf1d4501e2901b7a2) by [@frenck](https://github.com/frenck)
+2020/01/05 10:57 UTC - [042dadb](https://github.com/hassio-addons/addon-grafana/commit/042dadb841182dad702b446cf1d4501e2901b7a2) by [@frenck](https://github.com/frenck)
 > :fireworks: Updates maintenance/license year to 2020 
 
-2020/01/02 22:09 UTC - [ea66514](https://github.com/hassio-addons/addon-grafana/commit/ea66514c13581376520b52d278690bca80a2df23) by [@frenck](https://github.com/frenck)
+2020/01/05 10:57 UTC - [ea66514](https://github.com/hassio-addons/addon-grafana/commit/ea66514c13581376520b52d278690bca80a2df23) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades Grafana to 6.5.2 
 

grafana/README.md

@@ -47,7 +47,7 @@ If you are more interested in stable releases of our add-ons:
 
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-grafana/blob/7df8629/README.md
+[docs]: https://github.com/hassio-addons/addon-grafana/blob/5babc5d/README.md
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-grafana/54674?u=frenck
 [github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
@@ -56,6 +56,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-7df8629-blue.svg
+[release-shield]: https://img.shields.io/badge/version-5babc5d-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/7df8629
+[release]: https://github.com/hassio-addons/addon-grafana/tree/5babc5d
 [screenshot]: https://github.com/hassio-addons/addon-grafana/raw/master/images/screenshot.png

grafana/config.json

@@ -1,12 +1,12 @@
 {
   "name": "Grafana",
-  "version": "7df8629",
+  "version": "5babc5d",
   "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": 80,
+  "ingress_port": 1337,
   "panel_icon": "mdi:chart-timeline",
   "panel_title": "Grafana",
   "arch": [
@@ -17,15 +17,31 @@
   "boot": "auto",
   "hassio_api": true,
   "hassio_role": "default",
+  "map": [
+    "ssl"
+  ],
   "options": {
     "plugins": [],
-    "env_vars": []
+    "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": "match(^(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_])+$)",