diff --git a/img/grafana_icon.svg b/img/grafana_icon.svg
new file mode 100644
index 00000000..e91f3abd
--- /dev/null
+++ b/img/grafana_icon.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="351px" height="365px" viewBox="0 0 351 365" style="enable-background:new 0 0 351 365;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+</style>
+<g id="Layer_1_1_">
+</g>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="175.5" y1="30%" x2="175.5" y2="99%">
+	<stop  offset="0" style="stop-color:#F05A28"/>
+	<stop  offset="1" style="stop-color:#FBCA0A"/>
+</linearGradient>
+<path class="st0" d="M342,161.2c-0.6-6.1-1.6-13.1-3.6-20.9c-2-7.7-5-16.2-9.4-25c-4.4-8.8-10.1-17.9-17.5-26.8
+	c-2.9-3.5-6.1-6.9-9.5-10.2c5.1-20.3-6.2-37.9-6.2-37.9c-19.5-1.2-31.9,6.1-36.5,9.4c-0.8-0.3-1.5-0.7-2.3-1
+	c-3.3-1.3-6.7-2.6-10.3-3.7c-3.5-1.1-7.1-2.1-10.8-3c-3.7-0.9-7.4-1.6-11.2-2.2c-0.7-0.1-1.3-0.2-2-0.3
+	c-8.5-27.2-32.9-38.6-32.9-38.6c-27.3,17.3-32.4,41.5-32.4,41.5s-0.1,0.5-0.3,1.4c-1.5,0.4-3,0.9-4.5,1.3c-2.1,0.6-4.2,1.4-6.2,2.2
+	c-2.1,0.8-4.1,1.6-6.2,2.5c-4.1,1.8-8.2,3.8-12.2,6c-3.9,2.2-7.7,4.6-11.4,7.1c-0.5-0.2-1-0.4-1-0.4c-37.8-14.4-71.3,2.9-71.3,2.9
+	c-3.1,40.2,15.1,65.5,18.7,70.1c-0.9,2.5-1.7,5-2.5,7.5c-2.8,9.1-4.9,18.4-6.2,28.1c-0.2,1.4-0.4,2.8-0.5,4.2
+	C18.8,192.7,8.5,228,8.5,228c29.1,33.5,63.1,35.6,63.1,35.6c0,0,0.1-0.1,0.1-0.1c4.3,7.7,9.3,15,14.9,21.9c2.4,2.9,4.8,5.6,7.4,8.3
+	c-10.6,30.4,1.5,55.6,1.5,55.6c32.4,1.2,53.7-14.2,58.2-17.7c3.2,1.1,6.5,2.1,9.8,2.9c10,2.6,20.2,4.1,30.4,4.5
+	c2.5,0.1,5.1,0.2,7.6,0.1l1.2,0l0.8,0l1.6,0l1.6-0.1l0,0.1c15.3,21.8,42.1,24.9,42.1,24.9c19.1-20.1,20.2-40.1,20.2-44.4l0,0
+	c0,0,0-0.1,0-0.3c0-0.4,0-0.6,0-0.6l0,0c0-0.3,0-0.6,0-0.9c4-2.8,7.8-5.8,11.4-9.1c7.6-6.9,14.3-14.8,19.9-23.3
+	c0.5-0.8,1-1.6,1.5-2.4c21.6,1.2,36.9-13.4,36.9-13.4c-3.6-22.5-16.4-33.5-19.1-35.6l0,0c0,0-0.1-0.1-0.3-0.2
+	c-0.2-0.1-0.2-0.2-0.2-0.2c0,0,0,0,0,0c-0.1-0.1-0.3-0.2-0.5-0.3c0.1-1.4,0.2-2.7,0.3-4.1c0.2-2.4,0.2-4.9,0.2-7.3l0-1.8l0-0.9
+	l0-0.5c0-0.6,0-0.4,0-0.6l-0.1-1.5l-0.1-2c0-0.7-0.1-1.3-0.2-1.9c-0.1-0.6-0.1-1.3-0.2-1.9l-0.2-1.9l-0.3-1.9
+	c-0.4-2.5-0.8-4.9-1.4-7.4c-2.3-9.7-6.1-18.9-11-27.2c-5-8.3-11.2-15.6-18.3-21.8c-7-6.2-14.9-11.2-23.1-14.9
+	c-8.3-3.7-16.9-6.1-25.5-7.2c-4.3-0.6-8.6-0.8-12.9-0.7l-1.6,0l-0.4,0c-0.1,0-0.6,0-0.5,0l-0.7,0l-1.6,0.1c-0.6,0-1.2,0.1-1.7,0.1
+	c-2.2,0.2-4.4,0.5-6.5,0.9c-8.6,1.6-16.7,4.7-23.8,9c-7.1,4.3-13.3,9.6-18.3,15.6c-5,6-8.9,12.7-11.6,19.6c-2.7,6.9-4.2,14.1-4.6,21
+	c-0.1,1.7-0.1,3.5-0.1,5.2c0,0.4,0,0.9,0,1.3l0.1,1.4c0.1,0.8,0.1,1.7,0.2,2.5c0.3,3.5,1,6.9,1.9,10.1c1.9,6.5,4.9,12.4,8.6,17.4
+	c3.7,5,8.2,9.1,12.9,12.4c4.7,3.2,9.8,5.5,14.8,7c5,1.5,10,2.1,14.7,2.1c0.6,0,1.2,0,1.7,0c0.3,0,0.6,0,0.9,0c0.3,0,0.6,0,0.9-0.1
+	c0.5,0,1-0.1,1.5-0.1c0.1,0,0.3,0,0.4-0.1l0.5-0.1c0.3,0,0.6-0.1,0.9-0.1c0.6-0.1,1.1-0.2,1.7-0.3c0.6-0.1,1.1-0.2,1.6-0.4
+	c1.1-0.2,2.1-0.6,3.1-0.9c2-0.7,4-1.5,5.7-2.4c1.8-0.9,3.4-2,5-3c0.4-0.3,0.9-0.6,1.3-1c1.6-1.3,1.9-3.7,0.6-5.3
+	c-1.1-1.4-3.1-1.8-4.7-0.9c-0.4,0.2-0.8,0.4-1.2,0.6c-1.4,0.7-2.8,1.3-4.3,1.8c-1.5,0.5-3.1,0.9-4.7,1.2c-0.8,0.1-1.6,0.2-2.5,0.3
+	c-0.4,0-0.8,0.1-1.3,0.1c-0.4,0-0.9,0-1.2,0c-0.4,0-0.8,0-1.2,0c-0.5,0-1,0-1.5-0.1c0,0-0.3,0-0.1,0l-0.2,0l-0.3,0
+	c-0.2,0-0.5,0-0.7-0.1c-0.5-0.1-0.9-0.1-1.4-0.2c-3.7-0.5-7.4-1.6-10.9-3.2c-3.6-1.6-7-3.8-10.1-6.6c-3.1-2.8-5.8-6.1-7.9-9.9
+	c-2.1-3.8-3.6-8-4.3-12.4c-0.3-2.2-0.5-4.5-0.4-6.7c0-0.6,0.1-1.2,0.1-1.8c0,0.2,0-0.1,0-0.1l0-0.2l0-0.5c0-0.3,0.1-0.6,0.1-0.9
+	c0.1-1.2,0.3-2.4,0.5-3.6c1.7-9.6,6.5-19,13.9-26.1c1.9-1.8,3.9-3.4,6-4.9c2.1-1.5,4.4-2.8,6.8-3.9c2.4-1.1,4.8-2,7.4-2.7
+	c2.5-0.7,5.1-1.1,7.8-1.4c1.3-0.1,2.6-0.2,4-0.2c0.4,0,0.6,0,0.9,0l1.1,0l0.7,0c0.3,0,0,0,0.1,0l0.3,0l1.1,0.1
+	c2.9,0.2,5.7,0.6,8.5,1.3c5.6,1.2,11.1,3.3,16.2,6.1c10.2,5.7,18.9,14.5,24.2,25.1c2.7,5.3,4.6,11,5.5,16.9c0.2,1.5,0.4,3,0.5,4.5
+	l0.1,1.1l0.1,1.1c0,0.4,0,0.8,0,1.1c0,0.4,0,0.8,0,1.1l0,1l0,1.1c0,0.7-0.1,1.9-0.1,2.6c-0.1,1.6-0.3,3.3-0.5,4.9
+	c-0.2,1.6-0.5,3.2-0.8,4.8c-0.3,1.6-0.7,3.2-1.1,4.7c-0.8,3.1-1.8,6.2-3,9.3c-2.4,6-5.6,11.8-9.4,17.1
+	c-7.7,10.6-18.2,19.2-30.2,24.7c-6,2.7-12.3,4.7-18.8,5.7c-3.2,0.6-6.5,0.9-9.8,1l-0.6,0l-0.5,0l-1.1,0l-1.6,0l-0.8,0
+	c0.4,0-0.1,0-0.1,0l-0.3,0c-1.8,0-3.5-0.1-5.3-0.3c-7-0.5-13.9-1.8-20.7-3.7c-6.7-1.9-13.2-4.6-19.4-7.8
+	c-12.3-6.6-23.4-15.6-32-26.5c-4.3-5.4-8.1-11.3-11.2-17.4c-3.1-6.1-5.6-12.6-7.4-19.1c-1.8-6.6-2.9-13.3-3.4-20.1l-0.1-1.3l0-0.3
+	l0-0.3l0-0.6l0-1.1l0-0.3l0-0.4l0-0.8l0-1.6l0-0.3c0,0,0,0.1,0-0.1l0-0.6c0-0.8,0-1.7,0-2.5c0.1-3.3,0.4-6.8,0.8-10.2
+	c0.4-3.4,1-6.9,1.7-10.3c0.7-3.4,1.5-6.8,2.5-10.2c1.9-6.7,4.3-13.2,7.1-19.3c5.7-12.2,13.1-23.1,22-31.8c2.2-2.2,4.5-4.2,6.9-6.2
+	c2.4-1.9,4.9-3.7,7.5-5.4c2.5-1.7,5.2-3.2,7.9-4.6c1.3-0.7,2.7-1.4,4.1-2c0.7-0.3,1.4-0.6,2.1-0.9c0.7-0.3,1.4-0.6,2.1-0.9
+	c2.8-1.2,5.7-2.2,8.7-3.1c0.7-0.2,1.5-0.4,2.2-0.7c0.7-0.2,1.5-0.4,2.2-0.6c1.5-0.4,3-0.8,4.5-1.1c0.7-0.2,1.5-0.3,2.3-0.5
+	c0.8-0.2,1.5-0.3,2.3-0.5c0.8-0.1,1.5-0.3,2.3-0.4l1.1-0.2l1.2-0.2c0.8-0.1,1.5-0.2,2.3-0.3c0.9-0.1,1.7-0.2,2.6-0.3
+	c0.7-0.1,1.9-0.2,2.6-0.3c0.5-0.1,1.1-0.1,1.6-0.2l1.1-0.1l0.5-0.1l0.6,0c0.9-0.1,1.7-0.1,2.6-0.2l1.3-0.1c0,0,0.5,0,0.1,0l0.3,0
+	l0.6,0c0.7,0,1.5-0.1,2.2-0.1c2.9-0.1,5.9-0.1,8.8,0c5.8,0.2,11.5,0.9,17,1.9c11.1,2.1,21.5,5.6,31,10.3
+	c9.5,4.6,17.9,10.3,25.3,16.5c0.5,0.4,0.9,0.8,1.4,1.2c0.4,0.4,0.9,0.8,1.3,1.2c0.9,0.8,1.7,1.6,2.6,2.4c0.9,0.8,1.7,1.6,2.5,2.4
+	c0.8,0.8,1.6,1.6,2.4,2.5c3.1,3.3,6,6.6,8.6,10c5.2,6.7,9.4,13.5,12.7,19.9c0.2,0.4,0.4,0.8,0.6,1.2c0.2,0.4,0.4,0.8,0.6,1.2
+	c0.4,0.8,0.8,1.6,1.1,2.4c0.4,0.8,0.7,1.5,1.1,2.3c0.3,0.8,0.7,1.5,1,2.3c1.2,3,2.4,5.9,3.3,8.6c1.5,4.4,2.6,8.3,3.5,11.7
+	c0.3,1.4,1.6,2.3,3,2.1c1.5-0.1,2.6-1.3,2.6-2.8C342.6,170.4,342.5,166.1,342,161.2z"/>
+</svg>
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 00000000..869821e5
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,280 @@
+{
+  "manifest_version": "0.1",
+  "name": "grafana",
+  "version": "0.6.5",
+  "description": "An MCP server giving access to Grafana dashboards, data and more.",
+  "author": {
+    "name": "Ben Sully",
+    "email": "ben.sully@grafana.com"
+  },
+  "support": "https://github.com/grafana/mcp-grafana/issues",
+  "icon": "img/grafana_icon.svg",
+  "server": {
+    "type": "binary",
+    "entry_point": "dist/mcp-grafana",
+    "mcp_config": {
+      "command": "${__dirname}/dist/mcp-grafana",
+      "args": [],
+      "env": {
+        "GRAFANA_URL": "${user_config.grafana_url}",
+        "GRAFANA_SERVICE_ACCOUNT_TOKEN": "${user_config.grafana_service_account_token}",
+        "GRAFANA_USERNAME": "${user_config.grafana_username}",
+        "GRAFANA_PASSWORD": "${user_config.grafana_password}"
+      }
+    }
+  },
+  "tools": [
+    {
+      "name": "list_teams",
+      "description": "List all teams",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_users_by_org",
+      "description": "List all users in an organization",
+      "readOnlyHint": true
+    },
+    {
+      "name": "search_dashboards",
+      "description": "Search for dashboards",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_dashboard_by_uid",
+      "description": "Get a dashboard by uid",
+      "readOnlyHint": true
+    },
+    {
+      "name": "update_dashboard",
+      "description": "Update or create a new dashboard",
+      "destructiveHint": true
+    },
+    {
+      "name": "get_dashboard_panel_queries",
+      "description": "Get panel title, queries, datasource UID and type from a dashboard",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_dashboard_property",
+      "description": "Extract specific parts of a dashboard using JSONPath expressions",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_dashboard_summary",
+      "description": "Get a compact summary of a dashboard without full JSON",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_datasources",
+      "description": "List datasources",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_datasource_by_uid",
+      "description": "Get a datasource by uid",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_datasource_by_name",
+      "description": "Get a datasource by name",
+      "readOnlyHint": true
+    },
+    {
+      "name": "query_prometheus",
+      "description": "Execute a query against a Prometheus datasource",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_prometheus_metric_metadata",
+      "description": "List metric metadata",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_prometheus_metric_names",
+      "description": "List available metric names",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_prometheus_label_names",
+      "description": "List label names matching a selector",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_prometheus_label_values",
+      "description": "List values for a specific label",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_incidents",
+      "description": "List incidents in Grafana Incident",
+      "readOnlyHint": true
+    },
+    {
+      "name": "create_incident",
+      "description": "Create an incident in Grafana Incident",
+      "destructiveHint": true
+    },
+    {
+      "name": "add_activity_to_incident",
+      "description": "Add an activity item to an incident in Grafana Incident",
+      "destructiveHint": true
+    },
+    {
+      "name": "get_incident",
+      "description": "Get a single incident by ID",
+      "readOnlyHint": true
+    },
+    {
+      "name": "query_loki_logs",
+      "description": "Query and retrieve logs using LogQL (either log or metric queries)",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_loki_label_names",
+      "description": "List all available label names in logs",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_loki_label_values",
+      "description": "List values for a specific log label",
+      "readOnlyHint": true
+    },
+    {
+      "name": "query_loki_stats",
+      "description": "Get statistics about log streams",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_alert_rules",
+      "description": "List alert rules",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_alert_rule_by_uid",
+      "description": "Get alert rule by UID",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_contact_points",
+      "description": "List notification contact points",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_oncall_schedules",
+      "description": "List schedules from Grafana OnCall",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_oncall_shift",
+      "description": "Get details for a specific OnCall shift",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_current_oncall_users",
+      "description": "Get users currently on-call for a specific schedule",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_oncall_teams",
+      "description": "List teams from Grafana OnCall",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_oncall_users",
+      "description": "List users from Grafana OnCall",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_sift_investigation",
+      "description": "Retrieve an existing Sift investigation by its UUID",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_sift_analysis",
+      "description": "Retrieve a specific analysis from a Sift investigation",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_sift_investigations",
+      "description": "Retrieve a list of Sift investigations with an optional limit",
+      "readOnlyHint": true
+    },
+    {
+      "name": "find_error_pattern_logs",
+      "description": "Finds elevated error patterns in Loki logs.",
+      "readOnlyHint": true
+    },
+    {
+      "name": "find_slow_requests",
+      "description": "Finds slow requests from the relevant tempo datasources.",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_pyroscope_label_names",
+      "description": "List label names matching a selector",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_pyroscope_label_values",
+      "description": "List label values matching a selector for a label name",
+      "readOnlyHint": true
+    },
+    {
+      "name": "list_pyroscope_profile_types",
+      "description": "List available profile types",
+      "readOnlyHint": true
+    },
+    {
+      "name": "fetch_pyroscope_profile",
+      "description": "Fetches a profile in DOT format for analysis",
+      "readOnlyHint": true
+    },
+    {
+      "name": "get_assertions",
+      "description": "Get assertion summary for a given entity",
+      "readOnlyHint": true
+    },
+    {
+      "name": "generate_deeplink",
+      "description": "Generate accurate deeplink URLs for Grafana resources",
+      "readOnlyHint": true
+    }
+  ],
+  "user_config": {
+    "grafana_url": {
+      "type": "string",
+      "title": "Grafana URL",
+      "description": "URL to your Grafana instance",
+      "required": true,
+      "sensitive": false
+    },
+    "grafana_service_account_token": {
+      "type": "string",
+      "title": "Grafana service account token",
+      "description": "Service account token used to authenticate with your Grafana instance",
+      "required": false,
+      "sensitive": true
+    },
+    "grafana_username": {
+      "type": "string",
+      "title": "Grafana username",
+      "description": "Username to authenticate with your Grafana instance",
+      "required": false,
+      "sensitive": false
+    },
+    "grafana_password": {
+      "type": "string",
+      "title": "Grafana password",
+      "description": "Password to authenticate with your Grafana instance",
+      "required": false,
+      "sensitive": true
+    }
+  },
+  "keywords": ["grafana", "observability", "instrumentation"],
+  "license": "Apache-2.0",
+  "privacy_policies": [],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/grafana/mcp-grafana"
+  }
+}