diff --git a/README.md b/README.md
index dacbffc89..c8cf3d299 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,19 @@ A secure and fast FTP server for Hass.io
 
 [:books: FTP add-on documentation][addon-doc-ftp]
 
+### ✓ [Grafana][addon-grafana]
+
+![Latest Version][grafana-version-shield]
+![Supports armhf Architecture][grafana-armhf-shield]
+![Supports aarch64 Architecture][grafana-aarch64-shield]
+![Supports amd64 Architecture][grafana-amd64-shield]
+![Supports i386 Architecture][grafana-i386-shield]
+![Docker Pulls][grafana-pulls-shield]
+
+The open platform for beautiful analytics and monitoring
+
+[:books: Grafana add-on documentation][addon-doc-grafana]
+
 ### ✓ [Happy Bubbles][addon-happy-bubbles]
 
 ![Latest Version][happy-bubbles-version-shield]
@@ -300,6 +313,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: AppDaemon][appdaemon3-issue]
 - [Open an issue for the add-on: Example][example-issue]
 - [Open an issue for the add-on: FTP][ftp-issue]
+- [Open an issue for the add-on: Grafana][grafana-issue]
 - [Open an issue for the add-on: Happy Bubbles][happy-bubbles-issue]
 - [Open an issue for the add-on: Home Assistant Control Panel][control-panel-issue]
 - [Open an issue for the add-on: Homebridge][homebridge-issue]
@@ -407,6 +421,15 @@ SOFTWARE.
 [ftp-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [ftp-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [ftp-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/980c5dc
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/980c5dc/README.md
+[grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
+[grafana-version-shield]: https://img.shields.io/badge/version-980c5dc-blue.svg
+[grafana-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/grafana-armhf.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-yes-green.svg
+[grafana-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
 [addon-happy-bubbles]: https://github.com/hassio-addons/addon-happy-bubbles/tree/a8f5734
 [addon-doc-happy-bubbles]: https://github.com/hassio-addons/addon-happy-bubbles/blob/a8f5734/README.md
 [happy-bubbles-issue]: https://github.com/hassio-addons/addon-happy-bubbles/issues
diff --git a/grafana/CHANGELOG.md b/grafana/CHANGELOG.md
new file mode 100644
index 000000000..912c633a3
--- /dev/null
+++ b/grafana/CHANGELOG.md
@@ -0,0 +1,3 @@
+2018/05/28 22:58 UTC - [980c5dc](https://github.com/hassio-addons/addon-grafana/commit/980c5dc02cce1169778d53d1b6413079d3ccc803) by [@frenck](https://github.com/frenck)
+> :books: Removed i386 references from README 
+
diff --git a/grafana/README.md b/grafana/README.md
new file mode 100644
index 000000000..eac62aa19
--- /dev/null
+++ b/grafana/README.md
@@ -0,0 +1,57 @@
+# Community Hass.io Add-ons: Grafana
+
+[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
+
+[![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
+
+[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+
+The open platform for beautiful analytics and monitoring.
+
+## About
+
+The analytics platform for all your metrics.
+
+Grafana allows you to query, visualize, alert on and understand your metrics
+no matter where they are stored. Create, explore, and share dashboards. Learn
+about your Home Automation system using sexy and compelling graphs, and other
+data visualizations.
+
+Combine this add-on with the InfluxDB add-on to get insanely powerful
+insights to your home.
+
+[Click here for the full documentation][docs]
+
+![Grafana in the Home Assistant Frontend][screenshot]
+
+## WARNING! THIS IS AN EDGE VERSION!
+
+This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
+add-ons are based upon the latest development version.
+
+- They may not work at all.
+- They might stop working at any time.
+- They could have a negative impact on your system.
+
+This repository was created for:
+
+- Anybody willing to test.
+- Anybody interested in trying out upcoming add-ons or add-on features.
+- Developers.
+
+If you are more interested in stable releases of our add-ons:
+
+<https://github.com/hassio-addons/repository>
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/frenck
+[discord-shield]: https://img.shields.io/discord/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[docs]: https://github.com/hassio-addons/addon-grafana/blob/980c5dc/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[release-shield]: https://img.shields.io/badge/version-980c5dc-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/980c5dc
+[screenshot]: https://github.com/hassio-addons/addon-grafana/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/grafana/config.json b/grafana/config.json
new file mode 100644
index 000000000..4e45d7c39
--- /dev/null
+++ b/grafana/config.json
@@ -0,0 +1,45 @@
+{
+  "name": "Grafana",
+  "version": "980c5dc",
+  "slug": "grafana",
+  "description": "The open platform for beautiful analytics and monitoring",
+  "url": "https://community.home-assistant.io/?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf"
+  ],
+  "map": [
+    "ssl"
+  ],
+  "boot": "auto",
+  "ports": {
+    "8086/tcp": 8086,
+    "8888/tcp": 8888
+  },
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": false,
+  "options": {
+    "log_level": "info",
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "plugins": []
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "plugins": [
+      "str"
+    ]
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/grafana-{arch}"
+}
\ No newline at end of file
diff --git a/grafana/icon.png b/grafana/icon.png
new file mode 100644
index 000000000..e9dff3b00
Binary files /dev/null and b/grafana/icon.png differ
diff --git a/grafana/logo.png b/grafana/logo.png
new file mode 100644
index 000000000..081dfb32d
Binary files /dev/null and b/grafana/logo.png differ