diff --git a/devicon.json b/devicon.json
index 09046c14..46ee8761 100644
--- a/devicon.json
+++ b/devicon.json
@@ -1819,6 +1819,38 @@
         "color": "#02303a",
         "aliases": []
     },
+    {
+        "name": "grafana",
+        "tags": [
+            "monitoring",
+            "analytics",
+            "metrics",
+            "logs",
+            "visualization",
+            "web-application"
+        ],
+        "versions": {
+            "svg": [
+                "original",
+                "original-wordmark"
+            ],
+            "font": [
+                "original",
+                "original-wordmark"
+            ]
+        },
+        "color": "#E78040",
+        "aliases": [
+            {
+                "base": "original",
+                "alias": "plain"
+            },
+            {
+                "base": "original-wordmark",
+                "alias": "plain-wordmark"
+            }
+        ]
+    },
     {
         "name": "grails",
         "tags": [
diff --git a/icons/grafana/grafana-original-wordmark.svg b/icons/grafana/grafana-original-wordmark.svg
new file mode 100644
index 00000000..2bea7c15
--- /dev/null
+++ b/icons/grafana/grafana-original-wordmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#565656" d="M27.8 114c-.3 6.7-5.6 12-12.3 12-7 0-12.2-5.6-12.2-12.5S8.9 101 15.8 101c3.1 0 6.1 1.4 8.7 3.7l-2 2.5c-2-1.7-4.3-2.9-6.7-2.9-5 0-9.2 4.1-9.2 9.2 0 5.2 3.9 9.2 8.9 9.2 4.4 0 7.9-3.2 8.7-7.5H14.1v-3h13.7v1.8zM39.3 112.3h-1.9c-2 0-3.7 1.7-3.7 3.7v9.7h-3.3V109h2.7v1.4c.9-.9 2.3-1.4 3.9-1.4h3.6l-1.3 3.3zM57.6 125.7h-2.9v-2.1c-2.2 2.1-5.6 3.2-9.1 1.6-2.6-1.1-4.5-3.5-5-6.3-1-5.4 3.2-10.1 8.4-10.1 2.2 0 4.3.9 5.7 2.4v-2.1h2.9v16.6zm-3.4-7c.8-3.4-1.8-6.5-5.1-6.5-2.9 0-5.2 2.4-5.2 5.2 0 3.2 2.8 5.7 6.1 5.2 1.9-.3 3.7-2 4.2-3.9zM64.2 108.2v.9h5.3v2.9h-5.3v13.7H61v-17.5c0-3.7 2.6-5.8 6-5.8h4l-1.4 3.2H67c-1.6 0-2.8 1.2-2.8 2.6zM87.2 125.7h-2.8v-2.1c-2.2 2.1-5.6 3.2-9.1 1.6-2.6-1.1-4.5-3.5-5-6.3-1-5.4 3.2-10.1 8.4-10.1 2.2 0 4.3.9 5.7 2.4v-2.1h2.9l-.1 16.6zm-3.4-7c.8-3.4-1.8-6.5-5.1-6.5-2.9 0-5.2 2.4-5.2 5.2 0 3.2 2.8 5.7 6.1 5.2 2.1-.3 3.7-2 4.2-3.9zM105 116v9.8h-3.3v-9.9c0-2-1.7-3.7-3.7-3.7-2.1 0-3.7 1.7-3.7 3.7v9.9H91v-16.7h2.7v1.4c1.2-1.1 2.8-1.7 4.4-1.7 3.8.1 6.9 3.2 6.9 7.2zM124.6 125.7h-2.8v-2.1c-2.2 2.1-5.6 3.2-9.1 1.6-2.6-1.1-4.5-3.5-5-6.3-1-5.4 3.2-10.1 8.4-10.1 2.2 0 4.3.9 5.7 2.4v-2.1h2.9l-.1 16.6zm-3.4-7c.8-3.4-1.8-6.5-5.1-6.5-2.9 0-5.2 2.4-5.2 5.2 0 3.2 2.8 5.7 6.1 5.2 2.1-.3 3.7-2 4.2-3.9z"/><linearGradient id="grafana_gradient_2" gradientUnits="userSpaceOnUse" x1="45.842" y1="65.063" x2="45.842" y2="2.545" gradientTransform="translate(-.23 28.462) scale(1.4011)"><stop offset="0" stop-color="#fcee1f"/><stop offset="1" stop-color="#f15b2a"/></linearGradient><path fill="url(#grafana_gradient_2)" d="M108 44.5c-.2-1.6-.4-3.5-.9-5.5s-1.4-4.3-2.5-6.6c-1.2-2.3-2.6-4.8-4.6-7.1-.8-.9-1.6-1.8-2.5-2.7 1.4-5.4-1.6-10-1.6-10-5.2-.3-8.4 1.6-9.6 2.5l-.6-.3c-.9-.3-1.8-.7-2.7-1-.9-.3-1.9-.6-2.8-.8-.9-.3-2-.4-3-.6-.2 0-.3-.1-.5-.1C74.4 5.1 68 2 68 2c-7.4 4.8-8.9 11.2-8.9 11.2s0 .2-.1.3c-.4.1-.8.3-1.2.3-.5.2-1.1.3-1.6.6s-1.1.4-1.6.7c-1.1.5-2.1 1-3.2 1.6-1 .6-2 1.2-3 1.9-.2-.1-.3-.2-.3-.2-10-3.8-18.8.8-18.8.8-.8 10.6 4 17.3 4.9 18.5-.3.7-.4 1.3-.7 2-.8 2.4-1.3 4.9-1.6 7.4-.1.3-.1.8-.2 1.1C22.6 52.7 19.8 62 19.8 62c7.7 8.9 16.7 9.4 16.7 9.4 1.1 2 2.5 4 3.9 5.8.6.8 1.3 1.4 2 2.2-2.8 8 .4 14.7.4 14.7 8.6.3 14.2-3.7 15.4-4.7.9.3 1.7.5 2.6.8 2.6.7 5.4 1.1 8 1.2H72.2c4 5.8 11.2 6.6 11.2 6.6 5-5.4 5.4-10.6 5.4-11.8V85.6c1-.8 2-1.5 3.1-2.4 2-1.8 3.7-3.9 5.3-6.1.2-.2.3-.4.4-.6 5.7.3 9.7-3.6 9.7-3.6-.9-6-4.3-8.9-5-9.4l-.1-.1-.1-.1-.1-.1c0-.3.1-.7.1-1.1.1-.7.1-1.3.1-2v-2.5c0-.2 0-.3-.1-.5l-.1-.5-.1-.5c-.1-.7-.3-1.3-.3-2-.6-2.6-1.6-5-2.9-7.2-1.4-2.2-3-4.1-4.9-5.8-1.9-1.6-3.9-3-6.1-3.9-2.2-1-4.4-1.6-6.7-1.9-1.1-.2-2.3-.2-3.4-.2H75.9c-.6.1-1.2.2-1.7.3-2.3.4-4.4 1.3-6.3 2.4-1.9 1.1-3.5 2.6-4.9 4.2-1.4 1.6-2.4 3.3-3.1 5.2-.7 1.8-1.1 3.7-1.2 5.5v2c0 .3 0 .4.1.7.1.9.3 1.8.5 2.6.5 1.7 1.3 3.2 2.3 4.6 1 1.4 2.1 2.4 3.4 3.2 1.3.9 2.6 1.4 3.9 1.9s2.6.6 3.8.5H74.6c.2 0 .3-.1.4-.1.2 0 .3-.1.4-.1l.9-.3 1.5-.6c.5-.3.9-.5 1.3-.8.1-.1.3-.2.3-.3.4-.3.5-.9.2-1.4-.3-.3-.9-.4-1.3-.3 0 .7-.1.7-.3.8-.3.2-.8.3-1.1.4-.4.1-.9.3-1.3.3-.3 0-.4.1-.7.1H73.6s-.1 0 0 0h-.4c-.1 0-.3 0-.3-.1-.9-.2-2-.4-2.9-.9-.9-.4-1.9-1-2.6-1.8-.9-.8-1.5-1.6-2.1-2.6-.6-1-.9-2.1-1.1-3.2-.1-.6-.2-1.2-.1-1.8V55c0 .1 0 0 0 0v-.4c0-.3.1-.6.2-.9.4-2.6 1.7-5 3.7-6.9.5-.5 1-.9 1.6-1.3.6-.4 1.2-.8 1.8-1 .6-.3 1.3-.5 2-.7s1.4-.3 2-.3c.3 0 .7-.1 1-.1h.8c.1 0 0 0 0 0H77h.3c.8.1 1.5.2 2.2.3 1.4.3 2.9.9 4.3 1.6 2.7 1.5 5 3.8 6.4 6.6.7 1.4 1.2 2.9 1.4 4.5.1.4.1.8.2 1.2V60c0 .4-.1.9-.1 1.3-.1.4-.1.9-.2 1.3s-.2.9-.3 1.3c-.2.9-.5 1.6-.8 2.5-.6 1.6-1.4 3.2-2.5 4.5-2 2.8-4.9 5.1-8 6.6-1.6.7-3.2 1.3-4.9 1.5-.9.2-1.7.3-2.6.3H71c.1 0 0 0 0 0h-.1c-.4 0-.9 0-1.4-.1-1.9-.2-3.7-.5-5.5-1-1.8-.5-3.5-1.2-5.1-2-3.2-1.7-6.1-4.2-8.4-7-1.1-1.4-2.1-3-3-4.6-.9-1.6-1.4-3.3-2-5-.5-1.7-.8-3.5-.9-5.3v-3c0-.9.1-1.8.3-2.7.1-.9.3-1.8.4-2.7s.4-1.8.7-2.7c.5-1.8 1.1-3.5 1.9-5.1 1.5-3.2 3.5-6.1 5.8-8.4.6-.6 1.2-1.1 1.9-1.6.3-.3.9-.8 1.5-1.2.7-.4 1.4-.9 2.1-1.2.3-.2.7-.3 1.1-.5.2-.1.3-.2.6-.3.2-.1.3-.2.6-.3.8-.3 1.5-.6 2.3-.9.2-.1.4-.1.6-.2s.4-.1.6-.2l1.2-.3c.2-.1.4-.1.6-.2.2 0 .4-.1.6-.1.2 0 .4-.1.6-.1l.3-.1.3-.1c.2 0 .4-.1.6-.1.3 0 .4-.1.7-.1.2 0 .5-.1.7-.1.2 0 .3 0 .4-.1h1c.3 0 .4 0 .7-.1h.3s.1 0 0 0H76.2c1.5.1 3.1.3 4.5.5 2.9.5 5.7 1.4 8.2 2.7 2.5 1.2 4.8 2.7 6.6 4.3.1.1.3.2.3.3.1.1.3.2.3.3.3.2.4.4.7.6.3.2.4.4.7.6.2.3.4.4.6.7.9.9 1.6 1.8 2.3 2.6 1.4 1.8 2.5 3.6 3.3 5.3.1.1.1.2.2.3.1.1.1.2.2.3l.3.6.3.6.3.6c.3.8.6 1.5.9 2.3.4 1.2.7 2.2.9 3.1.1.3.4.6.8.6s.7-.3.7-.8c-.2-.5-.2-1.6-.3-2.9z"/></svg>
diff --git a/icons/grafana/grafana-original.svg b/icons/grafana/grafana-original.svg
new file mode 100644
index 00000000..4e23f509
--- /dev/null
+++ b/icons/grafana/grafana-original.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><linearGradient id="grafana_gradient_1" gradientUnits="userSpaceOnUse" x1="45.842" y1="89.57" x2="45.842" y2="8.802" gradientTransform="translate(-.23 28.462) scale(1.4011)"><stop offset="0" stop-color="#fcee1f"/><stop offset="1" stop-color="#f15b2a"/></linearGradient><path fill="url(#grafana_gradient_1)" d="M120.8 56.9c-.2-2.1-.6-4.5-1.2-7.2s-1.8-5.5-3.2-8.6c-1.5-3-3.4-6.2-5.9-9.1-1-1.2-2.1-2.3-3.2-3.5 1.8-6.9-2.1-13-2.1-13-6.7-.4-10.9 2.1-12.4 3.2-.2-.1-.6-.2-.8-.3-1.1-.4-2.3-.9-3.5-1.3-1.2-.3-2.4-.8-3.6-1-1.2-.3-2.5-.6-3.9-.8-.2 0-.4-.1-.7-.1C77.5 6 69.1 2 69.1 2c-9.6 6.2-11.4 14.4-11.4 14.4s0 .2-.1.4c-.6.1-1 .3-1.5.4-.7.2-1.4.4-2.1.8l-2.1.9c-1.4.7-2.8 1.3-4.2 2.1-1.3.8-2.6 1.5-3.9 2.4-.2-.1-.3-.2-.3-.2-12.9-5-24.3 1-24.3 1-1 13.8 5.2 22.3 6.4 23.9-.3.9-.6 1.7-.9 2.5-1 3.1-1.7 6.3-2.1 9.6-.1.4-.1 1-.2 1.4C10.5 67.5 7 79.6 7 79.6 16.9 91 28.5 91.7 28.5 91.7c1.4 2.6 3.2 5.2 5.1 7.5.8 1 1.7 1.9 2.5 2.9-3.6 10.3.6 19 .6 19 11.1.4 18.4-4.8 19.9-6.1 1.1.3 2.2.7 3.3 1 3.4.9 6.9 1.4 10.3 1.5h4.5c5.2 7.5 14.4 8.5 14.4 8.5 6.5-6.9 6.9-13.6 6.9-15.2V110.2c1.3-1 2.6-2 4-3.1 2.6-2.3 4.8-5.1 6.8-7.9.2-.2.3-.6.6-.8 7.4.4 12.5-4.6 12.5-4.6-1.2-7.7-5.6-11.4-6.5-12.1l-.1-.1-.1-.1-.1-.1c0-.4.1-.9.1-1.4.1-.9.1-1.7.1-2.5v-3.3c0-.2 0-.4-.1-.7l-.1-.7-.1-.7c-.1-.9-.3-1.7-.4-2.5-.8-3.3-2.1-6.5-3.7-9.2-1.8-2.9-3.9-5.3-6.3-7.5-2.4-2.1-5.1-3.9-7.9-5.1-2.9-1.3-5.7-2.1-8.7-2.4-1.4-.2-3-.2-4.4-.2h-2.3c-.8.1-1.5.2-2.2.3-3 .6-5.7 1.7-8.1 3.1-2.4 1.4-4.5 3.3-6.3 5.4-1.8 2.1-3.1 4.3-4 6.7-.9 2.3-1.4 4.8-1.5 7.2v2.6c0 .3 0 .6.1.9.1 1.2.3 2.3.7 3.4.7 2.2 1.7 4.2 3 5.9s2.8 3.1 4.4 4.2c1.7 1.1 3.3 1.9 5.1 2.4s3.4.8 5 .7h2.3c.2 0 .4-.1.6-.1.2 0 .3-.1.6-.1.3-.1.8-.2 1.1-.3.7-.2 1.3-.6 2-.8.7-.3 1.2-.7 1.7-1 .1-.1.3-.2.4-.3.6-.4.7-1.2.2-1.8-.4-.4-1.1-.6-1.7-.3-.1.1-.2.1-.4.2-.4.2-1 .4-1.4.6-.6.1-1.1.3-1.7.4-.3 0-.6.1-.9.1H76.5s-.1 0 0 0h-.7c-.1 0-.3 0-.4-.1-1.2-.2-2.5-.6-3.7-1.1-1.2-.6-2.4-1.3-3.4-2.3-1.1-1-2-2.1-2.8-3.4-.8-1.3-1.2-2.8-1.4-4.2-.1-.8-.2-1.5-.1-2.3v-.7c0 .1 0 0 0 0V70c0-.4.1-.8.2-1.2.6-3.3 2.2-6.5 4.7-8.9.7-.7 1.3-1.2 2.1-1.7.8-.6 1.5-1 2.3-1.3.8-.3 1.7-.7 2.5-.9.9-.2 1.8-.4 2.6-.4.4 0 .9-.1 1.3-.1h.8c.1 0 0 0 0 0h.4c1 .1 2 .2 2.9.4 1.9.4 3.7 1.1 5.5 2.1 3.5 2 6.5 5 8.3 8.6.9 1.8 1.5 3.7 1.9 5.8.1.6.1 1 .2 1.5v2.7c0 .6-.1 1.1-.1 1.7-.1.6-.1 1.1-.2 1.7s-.2 1.1-.3 1.7c-.2 1.1-.7 2.1-1 3.2-.8 2.1-1.9 4.1-3.2 5.8-2.6 3.6-6.3 6.6-10.3 8.5-2.1.9-4.2 1.7-6.4 2-1.1.2-2.2.3-3.3.3H73.3c.1 0 0 0 0 0h-.1c-.6 0-1.2 0-1.8-.1-2.4-.2-4.7-.7-7-1.3-2.3-.7-4.5-1.5-6.6-2.6-4.2-2.2-7.9-5.4-10.9-9-1.4-1.9-2.8-3.9-3.9-5.9s-1.9-4.3-2.5-6.5c-.7-2.2-1-4.5-1.1-6.8V65.8c0-1.1.1-2.3.3-3.5.1-1.2.3-2.3.6-3.5.2-1.2.6-2.3.9-3.5.7-2.3 1.4-4.5 2.4-6.6 2-4.2 4.5-7.9 7.5-10.9.8-.8 1.5-1.4 2.4-2.1.3-.3 1.1-1 2-1.5s1.8-1.1 2.8-1.5c.4-.2.9-.4 1.4-.7.2-.1.4-.2.8-.3.2-.1.4-.2.8-.3 1-.4 2-.8 3-1.1.2-.1.6-.1.8-.2.2-.1.6-.1.8-.2.6-.1 1-.2 1.5-.4.2-.1.6-.1.8-.2.2 0 .6-.1.8-.1.2 0 .6-.1.8-.1l.4-.1.4-.1c.2 0 .6-.1.8-.1.3 0 .6-.1.9-.1.2 0 .7-.1.9-.1.2 0 .3 0 .6-.1h.7c.3 0 .6 0 .9-.1h.4s.1 0 0 0h4.1c2 .1 4 .3 5.8.7 3.7.7 7.4 1.9 10.6 3.5 3.2 1.5 6.2 3.5 8.6 5.6.1.1.3.2.4.4.1.1.3.2.4.4.3.2.6.6.9.8.3.2.6.6.9.8.2.3.6.6.8.9 1.1 1.1 2.1 2.3 3 3.4 1.8 2.3 3.2 4.6 4.3 6.8.1.1.1.2.2.4.1.1.1.2.2.4s.2.6.4.8c.1.2.2.6.3.8.1.2.2.6.3.8.4 1 .8 2 1.1 3 .6 1.5.9 2.9 1.2 4 .1.4.6.8 1 .8.6 0 .9-.4.9-1-.3-1.7-.3-3.1-.4-4.8z"/></svg>
diff --git a/icons/grafana/grafana.eps b/icons/grafana/grafana.eps
new file mode 100644
index 00000000..1a4df198
Binary files /dev/null and b/icons/grafana/grafana.eps differ