diff --git a/public/v2/apps/grafana.json b/public/v2/apps/grafana.json
new file mode 100644
index 0000000..347ac62
--- /dev/null
+++ b/public/v2/apps/grafana.json
@@ -0,0 +1,36 @@
+{
+    "captainVersion": "2",
+    "documentation": "https://hub.docker.com/r/grafana/grafana",
+    "displayName": "Grafana",
+    "description": "Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored.",
+    "dockerCompose": {
+        "services": {
+            "$$cap_appname": {
+                "containerHttpPort": "3000",
+                "image": "grafana/grafana@$$cap_version",
+                "restart": "always",
+                "volumes": [
+                    "$$cap_appname-config:/etc/grafana",
+                    "$$cap_appname-data:/var/lib/grafana"
+                ]
+            }
+        },
+        "version": "2",
+        "volumes": {
+            "$$cap_appname-config": {},
+            "$$cap_appname-data": {}
+        }
+    },
+    "instructions": {
+        "end": "Grafana is now starting.  You can log in with the default login/password of admin/admin.",
+        "start": "Read more about Grafana: https://grafana.com/"
+    },
+    "variables": [
+        {
+            "label": "Grafana Docker Hash",
+            "defaultValue": "sha256:4171e7e8c44bb17f9e5bffdcd3710a6d624828d73b4eb638682543c5ce86bbe9",
+            "description": "Starts with 'sha256:'.  Find on Docker Hub.  Default is latest as of 2020-06-30.",
+            "id": "$$cap_version"
+        }
+    ]
+}
diff --git a/public/v2/logos/grafana.png b/public/v2/logos/grafana.png
new file mode 100644
index 0000000..c865949
Binary files /dev/null and b/public/v2/logos/grafana.png differ