From 95668f5eabff2ae17f96496ffb87e280b8879846 Mon Sep 17 00:00:00 2001
From: Teknium <127238744+teknium1@users.noreply.github.com>
Date: Tue, 25 Aug 2026 12:50:24 -0700
Subject: [PATCH] fix(mcp): Atlassian catalog entry no longer 404s + Grafana
 defensive curation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- atlassian: /v1/sse was deprecated by Atlassian after June 30 2026 —
  installs OAuth'd fine then failed every handshake with 404 (#91538).
  Now points at /v1/mcp/authv2, the endpoint Atlassian's docs recommend
  for custom clients (live-probed: OAuth 2.1 + DCR intact).
- grafana (on top of @cedricziel's #93183 entry): defensive
  default_excluded for ask_assistant (opaque Assistant delegation
  meta-tool, bills usage) and agento11y_* (Grafana's own agent-obs
  product suite) — both from Grafana's published tool tables, both
  no-ops until the Cloud surface serves them; billing note added to
  post_install.
---
 contributors/emails/mail@cedric-ziel.com |  1 +
 optional-mcps/atlassian/manifest.yaml    |  6 +++++-
 optional-mcps/grafana/manifest.yaml      | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 contributors/emails/mail@cedric-ziel.com

diff --git a/contributors/emails/mail@cedric-ziel.com b/contributors/emails/mail@cedric-ziel.com
new file mode 100644
index 0000000000..326fcd176d
--- /dev/null
+++ b/contributors/emails/mail@cedric-ziel.com
@@ -0,0 +1 @@
+cedricziel
diff --git a/optional-mcps/atlassian/manifest.yaml b/optional-mcps/atlassian/manifest.yaml
index 74c1700b5a..fb48f84e78 100644
--- a/optional-mcps/atlassian/manifest.yaml
+++ b/optional-mcps/atlassian/manifest.yaml
@@ -13,7 +13,11 @@ source: https://support.atlassian.com/rovo/docs/getting-started-with-the-atlassi
 # exchange, and refresh.
 transport:
   type: http
-  url: https://mcp.atlassian.com/v1/sse
+  # /v1/sse was deprecated by Atlassian after June 30, 2026 (404s since the
+  # cutover — OAuth succeeded but every handshake failed; issue #91538).
+  # /v1/mcp/authv2 is the endpoint Atlassian's docs recommend for custom
+  # clients (Streamable HTTP, native OAuth 2.1 + DCR — verified live).
+  url: https://mcp.atlassian.com/v1/mcp/authv2
 
 auth:
   type: oauth
diff --git a/optional-mcps/grafana/manifest.yaml b/optional-mcps/grafana/manifest.yaml
index 530ea885ce..f7f7b0442c 100644
--- a/optional-mcps/grafana/manifest.yaml
+++ b/optional-mcps/grafana/manifest.yaml
@@ -23,6 +23,22 @@ transport:
 auth:
   type: oauth
 
+# Defensive excludes (verified against Grafana's published MCP tool tables).
+# The hosted Cloud server's documented surface (~35 tools: dashboards,
+# datasources, Prometheus/Loki/Tempo/Pyroscope queries, annotations,
+# rendering) is clean — but the sibling OSS roster carries two clusters we
+# never want auto-enabled if the Cloud surface grows toward it:
+#   - ask_assistant: opaque delegation to Grafana Assistant (an agent
+#     meta-tool, same class as Railway's railway-agent) that also bills
+#     Assistant usage per call.
+#   - agento11y_*: eight multiplexed tools for Grafana's own
+#     agent-observability product surface.
+# Both no-op harmlessly while the Cloud server doesn't serve them.
+tools:
+  default_excluded:
+    - ask_assistant
+    - "agento11y_*"
+
 # Composer-suggestion triggers (desktop brand pills).
 suggest:
   keywords:
@@ -44,3 +60,6 @@ post_install: |
   Requires a hosted Grafana Cloud stack and the "Assistant Cloud MCP User"
   role (Editor or higher has it by default). Self-hosted Grafana isn't
   supported by this endpoint — use the OSS mcp-grafana server instead.
+
+  Billing note: Grafana counts each user connecting via MCP as an active
+  Grafana Assistant user — see grafana.com Assistant pricing.