Skip to content

Reorganize MCP Server toolsets and tools (Redux) [DOCS-13846]#35931

Merged
joepeeples merged 19 commits intomasterfrom
joepeeples/13846-mcp-tools-reorg
Apr 15, 2026
Merged

Reorganize MCP Server toolsets and tools (Redux) [DOCS-13846]#35931
joepeeples merged 19 commits intomasterfrom
joepeeples/13846-mcp-tools-reorg

Conversation

@joepeeples
Copy link
Copy Markdown
Contributor

@joepeeples joepeeples commented Apr 10, 2026

What does this PR do? What is the motivation?

  • Move toolsets list and instructions from index to setup page, for continuity with other setup procedures
    • Reorder toolset section to be action-forward: first instructions and examples, then list for reference
    • Split listed toolsets into separate lists for GA and Preview
  • Move tool descriptions to separate page as a reference
    • Group tools under toolset headings for easier navigation
    • Add short instructions on enabling toolsets to tools page, with links to additional instructions
  • Additional cleanup, refactoring

Redux of #35608 due to merge conflicts.

Important

For reviewers: Hopefully this PR is a fairly quick review, as it doesn't add or change much actual content, just shuffles it around. Please contact me (@joepeeples) if you have any questions, thanks!

Merge instructions

Merge readiness:

  • Ready for merge

For Datadog employees:

Your branch name MUST follow the <name>/<description> convention and include the forward slash (/). Without this format, your pull request will not pass CI, the GitLab pipeline will not run, and you won't get a branch preview. Getting a branch preview makes it easier for us to check any issues with your PR, such as broken links.

If your branch doesn't follow this format, rename it or create a new branch and PR.

[6/5/2025] Merge queue has been disabled on the documentation repo. If you have write access to the repo, the PR has been reviewed by a Documentation team member, and all of the required checks have passed, you can use the Squash and Merge button to merge the PR. If you don't have write access, or you need help, reach out in the #documentation channel in Slack.

AI assistance

Used Claude Code to help move text and update many link references after moving.

Additional notes

@joepeeples joepeeples added the WORK IN PROGRESS No review needed, it's a wip ;) label Apr 10, 2026
@github-actions github-actions Bot added the Architecture Everything related to the Doc backend label Apr 13, 2026
@github-actions
Copy link
Copy Markdown
Contributor

@joepeeples joepeeples removed the WORK IN PROGRESS No review needed, it's a wip ;) label Apr 15, 2026
@joepeeples joepeeples marked this pull request as ready for review April 15, 2026 15:57
@joepeeples joepeeples requested review from a team as code owners April 15, 2026 15:57
@joepeeples joepeeples requested a review from sumedham April 15, 2026 15:58
Copy link
Copy Markdown
Contributor

@domalessi domalessi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! The reorg def makes sense. A few minor suggestions but approving so you're not blocked on me

Comment thread content/en/bits_ai/mcp_server/tools.md

- Get the details of Watchdog story `abc123`.

### `apm_search_change_stories`
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apm_search_change_stories is missing a *Permissions Required:* line. Similar tools in the same section explicitly list permissions (or None). Same issue with llm_observability_onboarding and source_map_uploads in the Onboarding section. Suggest adding the line for consistency — either the actual permissions or *Permissions Required: None*.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an existing issue, not anything introduced in this PR. I'll try to follow up with the original contributor of this content to verify what permissions are required.

- Post an update that the hotfix has been deployed and we're monitoring.
- Document the root cause analysis findings on this case.

### `link_jira_issue_to_datadog_case`
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

link_jira_issue_to_datadog_case is missing a description. Every other tool entry in this file has a description sentence between the permissions line and the example prompts — this one jumps straight from permissions to bullets. Please add a sentence explaining what the tool does, for example: "Links a Jira issue to a Datadog case, enabling cross-platform tracking."

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an existing issue, not anything introduced in this PR. I'll try to follow up with the original contributor of this content to verify what description we should use.

Comment thread content/en/bits_ai/mcp_server/tools.md Outdated
- Create a reference table called `ip_allowlist` from the file `allowlist.csv` in my S3 bucket `my-data-bucket`.
- Set up a new GCS-backed reference table called `customer_tiers` with automatic sync enabled.

## Security
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ## Security section description says "Tools for code security scanning and searching security signals and security findings," but only datadog_secrets_scan is listed here. The original _index.md also documented datadog_code_security_scan and datadog_sast_scan in this section. If those tools were intentionally removed, please update the description. If this was an oversight, please restore the two entries.

Copy link
Copy Markdown
Contributor Author

@joepeeples joepeeples Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

datadog_code_security_scan and datadog_sast_scan should not be included. They were removed in #35410, but I believe they were accidentally re-introduced into master as of #35140. I suspect the latter PR's working branch was out of date when it got merged and didn't include the original removal PR.

The intro sentence might be OK, too. datadog_secrets_scan does seem relevant to "code security scanning" as the tool "scans code" for security purposes. Regardless, it's another pre-existing issue, not anything introduced in this PR, so I'l try to follow up separately.

@joepeeples joepeeples merged commit c67951e into master Apr 15, 2026
30 checks passed
@joepeeples joepeeples deleted the joepeeples/13846-mcp-tools-reorg branch April 15, 2026 19:32
jeff-morgan-dd pushed a commit that referenced this pull request Apr 16, 2026
* move tools to new separate page, add to nav

* move Toolsets section from _index.md to setup.md

* clean up _index.md: remove moved sections, add tools pointer and further reading

* update cross-refs in setup.md, remove redundant heading from tools.md

* add toolset section headers and rewrite intro in tools.md

* add Dashboards tools, reorder & create new section

per  #35891

* fix heading, links

* add toolset descriptions to new Tools page

* update from master: add alerting tools

per #35941

* reorder toolsets instructions & list

* split toolsets into GA and Preview lists

* add short toolset setup instructions to Tools page

* add link to Toolsets section from landing page

* fix heading capitalization (sentence-case)

* update from master: add reference tables toolset

per #35140

* apply feedback from review
StefonSimmons pushed a commit that referenced this pull request Apr 16, 2026
* move tools to new separate page, add to nav

* move Toolsets section from _index.md to setup.md

* clean up _index.md: remove moved sections, add tools pointer and further reading

* update cross-refs in setup.md, remove redundant heading from tools.md

* add toolset section headers and rewrite intro in tools.md

* add Dashboards tools, reorder & create new section

per  #35891

* fix heading, links

* add toolset descriptions to new Tools page

* update from master: add alerting tools

per #35941

* reorder toolsets instructions & list

* split toolsets into GA and Preview lists

* add short toolset setup instructions to Tools page

* add link to Toolsets section from landing page

* fix heading capitalization (sentence-case)

* update from master: add reference tables toolset

per #35140

* apply feedback from review
jeff-morgan-dd added a commit that referenced this pull request Apr 16, 2026
* Adding backlog of blog links

* Clean up blog links

* Remove duplicate link

* Update content/en/monitors/configuration/_index.md

Co-authored-by: Bryce Eadie <[email protected]>

* Update content/en/sheets/_index.md

Co-authored-by: Bryce Eadie <[email protected]>

* Update content/en/monitors/_index.md

Co-authored-by: Bryce Eadie <[email protected]>

* Update content/en/service_level_objectives/_index.md

Co-authored-by: Bryce Eadie <[email protected]>

* Update content/en/observability_pipelines/rehydration.md

Co-authored-by: Bryce Eadie <[email protected]>

* Update content/en/network_monitoring/network_path/_index.md

Co-authored-by: Bryce Eadie <[email protected]>

* Remove unrelated links per suggestions from code review

Co-authored-by: Bryce Eadie <[email protected]>

* Updating link order

* Reorganize links for consistent ordering

* Link ordering updates

* Apply suggestions from code review

Co-authored-by: Bryce Eadie <[email protected]>

* Update content/en/actions/agents/_index.md

Co-authored-by: Bryce Eadie <[email protected]>

* [CONTINT-5127] Update cluster naming rules (#35000)

* Update cluster naming rules

Co-authored-by: Bryce Eadie <[email protected]>

* Update SCA vulnerability database timing to include malicious packages (#35989)

Co-authored-by: Claude Sonnet 4.6 <[email protected]>

* [RUM] RUM Managed Archive (#35691)

* Add initial documentation for RUM Managed Archive

* Update RUM Managed Archive docs and add screenshots

* Update RUM Managed Archive docs with navigation, setup, and query improvements

* Restructure How Managed Archive works section and refine note formatting

* Update content/en/real_user_monitoring/managed_archive.md

Co-authored-by: Rosa Trieu <[email protected]>

* Update content/en/real_user_monitoring/managed_archive.md

Co-authored-by: Rosa Trieu <[email protected]>

* Update content/en/real_user_monitoring/managed_archive.md

Co-authored-by: Rosa Trieu <[email protected]>

* Update content/en/real_user_monitoring/managed_archive.md

Co-authored-by: Rosa Trieu <[email protected]>

* Update content/en/real_user_monitoring/managed_archive.md

Co-authored-by: Rosa Trieu <[email protected]>

* Apply reviewer suggestions to managed_archive.md

* Remove redundant paragraph, move bullets before screenshot

* Update screenshots and refine Recover sessions section

* Remove overview screenshot and unused asset

* Remove preview callout

---------

Co-authored-by: Rosa Trieu <[email protected]>

* [MLOB] update  llm observability auto-instrumentation docs (#34538)

* cut down on troubleshooting sections, add package and integration names

* Update content/en/llm_observability/instrumentation/auto_instrumentation.md

Co-authored-by: Bryce Eadie <[email protected]>

* Update content/en/llm_observability/instrumentation/auto_instrumentation.md

Co-authored-by: Bryce Eadie <[email protected]>

* add in link reference

* fix link location

---------

Co-authored-by: Bryce Eadie <[email protected]>

* Remove otel. metric prefix documentation (#35828)

* Remove otel. metric prefix documentation

The Datadog Exporter no longer prepends otel. to
system.* and process.* metrics. Update docs to reflect
the new behavior across metrics mapping, query metrics,
runtime metrics, and Kafka metrics pages.

* Clean up redundant section and orphaned link refs

Remove the "How OpenTelemetry metrics appear in Datadog" section
that was restating the overview. Simplify runtime metrics prefix
sentence and remove unused link definitions.

* add reference tables toolset doc to MCP docs (#35140)

* add reference tables toolset doc to MCP docs

* address PR suggestions: use backticks for inline values

* [OTAGENT-923] Add docs for DDOT Windows preview (#35951)

* Draft DDOT windows docs

* Apply suggestion from @brett0000FF

Co-authored-by: Brett Blue <[email protected]>

---------

Co-authored-by: Brett Blue <[email protected]>

* Add fleet tracers, clusters, and instrumented pods endpoints (#35881)

Co-authored-by: ci.datadog-api-spec <[email protected]>

* Add unified SDK mobile vitals cdocs pages (#35860)

* Migrate mobile vitals pages to unified SDK cdocs format

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

* Add shared overview partial to mobile vitals shortcodes

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

* update/remove image and navigation

* fixes

* [DOCS-11179] Rearrange track user interactions

* Revert "[DOCS-11179] Rearrange track user interactions"

This reverts commit 0f69929.

* correct and add links per dom comments

---------

Co-authored-by: Claude Sonnet 4.6 <[email protected]>

* [DOCS-13867] Fix DatadogProviderConfiguration constructor in Expo setup code sample (#35855)

* Fix DatadogProviderConfiguration constructor in Expo setup code sample

The code sample used invalid JavaScript syntax, passing configuration
properties as flat positional arguments instead of wrapping them in an
options object as the SDK constructor expects.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* Add TrackingConsent import and fix constructor in React Native setup snippets

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>

* Update generate_metrics.md to remove access request info (#35992)

Removed callout about requesting access to custom metrics from traces.

* e-linds/Update inferred_services.md (#36014)

* e-linds/Update installation.md with namespace context (#36011)

* e-linds/Update installation.md with namespace context

* Update content/en/containers/kubernetes/installation.md

Co-authored-by: domalessi <[email protected]>

---------

Co-authored-by: domalessi <[email protected]>

* Reorganize MCP Server toolsets and tools (Redux) [DOCS-13846] (#35931)

* move tools to new separate page, add to nav

* move Toolsets section from _index.md to setup.md

* clean up _index.md: remove moved sections, add tools pointer and further reading

* update cross-refs in setup.md, remove redundant heading from tools.md

* add toolset section headers and rewrite intro in tools.md

* add Dashboards tools, reorder & create new section

per  #35891

* fix heading, links

* add toolset descriptions to new Tools page

* update from master: add alerting tools

per #35941

* reorder toolsets instructions & list

* split toolsets into GA and Preview lists

* add short toolset setup instructions to Tools page

* add link to Toolsets section from landing page

* fix heading capitalization (sentence-case)

* update from master: add reference tables toolset

per #35140

* apply feedback from review

* [DOCS-13990] Update SSI instrumentation rules docs for Linux and Windows (#35980)

* [DOCS-13990] Add instrumentation rules to Windows SSI docs, update Linux

- Remove preview callout from Linux instrumentation rules section
- Update attributes table on Linux: rename Executable File Path to Executable Full Path, add Entry Point File
- Add Define instrumentation rules section to Windows SSI page with full attributes table including IIS Application Pool
- Add example use cases with annotated screenshots to both pages

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

* [DOCS-13990] Address PR review feedback

- Add Advanced options section to Windows page, move instrumentation rules under it
- Add second example to both Linux and Windows using collapse-content menus
- Fix alt text: shorten and add missing periods
- Trim Entry Point File and IIS Application Pool table descriptions
- Soften absolute claim in IIS Application Pool description

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

* [DOCS-13990] Remove periods from alt text

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

* [DOCS-13990] Use HTML tags for code and bold inside collapse-content shortcodes

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

* [DOCS-13990] Add Linux example 2 image and update example text

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

* [DOCS-13990] Fix missing article and style IIS Application Pool in examples

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

* Apply suggestions from code review

Co-authored-by: domalessi <[email protected]>

---------

Co-authored-by: Claude Sonnet 4.6 <[email protected]>

* [BITS-4136] Add retention info for Bits AI SRE investigations (#35550)

* add retention info for Bits AI SRE investigations

* Update content/en/data_security/data_retention_periods.md

---------

Co-authored-by: domalessi <[email protected]>

* Add minimum Kafka ACL permissions for Kafka Monitoring and Messages (#35817)

* Add minimum Kafka ACL permissions for Kafka Monitoring and Messages

Document the minimum Kafka ACL permissions required for the Datadog Agent
when connecting to ACL-enabled Kafka clusters.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* Address PR review comments

- Move ACL permissions section after the setup image and paragraph in _index.md
- Nest Kafka ACL permissions under Prerequisites (as H3) in messages.md

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* Move message reading permissions to _index.md, revert messages.md

Add a second table for Read on TOPIC (message viewing) below the
monitoring permissions table. Revert all changes to messages.md.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* Remove messages.md, consolidate into Kafka Monitoring page

Delete the separate messages.md page and add aliases for redirects.
Remove the Messages nav menu entry. Update _index.md to remove the
dead link to messages.md.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* Revert messages.md deletion, keep ACL permissions in _index.md only

Restore messages.md and nav menu to original state. ACL permissions
for both monitoring and message reading are in the Kafka Monitoring
page only.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* Update content/en/data_streams/kafka/_index.md

Co-authored-by: domalessi <[email protected]>

* Update content/en/data_streams/kafka/_index.md

Co-authored-by: domalessi <[email protected]>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
Co-authored-by: domalessi <[email protected]>

* Add private: true to mobile vitals Cdocs pages (#36013)

* Add private: true to mobile vitals Cdocs pages

Mark the unified client_sdks/mobile_vitals and all SDK-specific mobile vitals wrapper pages as private so they are excluded from sitemap and search.

* Remove private: true from SDK-specific mobile vitals pages

* adding files (#36022)

* tag files in account management folder (#36017)

* [SDTEST-3547] Updated test tags examples (#35994)

* updated test tags examples
* updated variable name

* Pull WP agent documentation from 7.78.x branch (#36007)

* feat: add context to the chat (#35950)

* Add team and assignee filters for Search Error Tracking Issues API (#35900)

Co-authored-by: ci.datadog-api-spec <[email protected]>

* follow-up fixes to toolsets instructions (#36019)

* [Phrase] Translation Updates - 2026-04-01 (#35694)

* Updates 18 translation(s)

* Reverted further_reading tags from English back to translated language

* claude assist

Signed-off-by: Brian Deutsch <[email protected]>

* inject headings to backfill anchor links

Signed-off-by: Brian Deutsch <[email protected]>

---------

Signed-off-by: Brian Deutsch <[email protected]>
Co-authored-by: webops-guacbot[bot] <214537265+webops-guacbot[bot]@users.noreply.github.com>
Co-authored-by: jeff-morgan-dd <[email protected]>
Co-authored-by: Brian Deutsch <[email protected]>

* [Phrase] [Phase 2+3] Translation Updates - 2026-04-15 (#36016)

* Updates 52 translation(s)

* claude fixes

Signed-off-by: Brian Deutsch <[email protected]>

---------

Signed-off-by: Brian Deutsch <[email protected]>
Co-authored-by: webops-guacbot[bot] <214537265+webops-guacbot[bot]@users.noreply.github.com>
Co-authored-by: Brian Deutsch <[email protected]>

* fix: restore correct OWASP acronym expansion in terms glossary (#36036)

JJ-Change-Id: mwoxlk

Co-authored-by: May Lee <[email protected]>

* Clarify OpenTelemetry output format support for metrics (#36029)

Updated note on metric streaming to clarify support for OpenTelemetry output formats.

* Resolve merge conflict

---------

Signed-off-by: Brian Deutsch <[email protected]>
Co-authored-by: Bryce Eadie <[email protected]>
Co-authored-by: Jon Rosario <[email protected]>
Co-authored-by: Gorka Vicente <[email protected]>
Co-authored-by: Claude Sonnet 4.6 <[email protected]>
Co-authored-by: qsellem <[email protected]>
Co-authored-by: Rosa Trieu <[email protected]>
Co-authored-by: Sam Brenner <[email protected]>
Co-authored-by: Brett Blue <[email protected]>
Co-authored-by: Guillaume Brizolier <[email protected]>
Co-authored-by: Stanley Liu <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
Co-authored-by: ci.datadog-api-spec <[email protected]>
Co-authored-by: Ida Adjivon <[email protected]>
Co-authored-by: Merve Bolat <[email protected]>
Co-authored-by: e-linds <[email protected]>
Co-authored-by: domalessi <[email protected]>
Co-authored-by: Joe Peeples <[email protected]>
Co-authored-by: Dan Hodge <[email protected]>
Co-authored-by: Piotr WOLSKI <[email protected]>
Co-authored-by: cecilia saixue wat-kim <[email protected]>
Co-authored-by: Yehor Popovych <[email protected]>
Co-authored-by: Yoann Ghigoff <[email protected]>
Co-authored-by: Reda El Issati <[email protected]>
Co-authored-by: webops-guacbot[bot] <214537265+webops-guacbot[bot]@users.noreply.github.com>
Co-authored-by: Brian Deutsch <[email protected]>
Co-authored-by: Romain Marcadier <[email protected]>
Co-authored-by: May Lee <[email protected]>
Co-authored-by: helenefav <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Architecture Everything related to the Doc backend

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants