Expose MCP as toolset, and move prompts and handlers to shared package by saswatamcode · Pull Request #20 · rhobs/obs-mcp

saswatamcode · 2026-01-29T15:59:48Z

No description provided.

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

iNecas · 2026-02-06T15:07:48Z

pkg/mcp/handlers.go

-
-		return mcp.NewToolResultStructured(output, string(jsonResult)), nil
+		return handlers.ExecuteRangeQueryHandler(ctx, promClient, handlers.RangeQueryInput{
+			Query:    req.GetString("query", ""),


I'm not a big fan of this duplication of param extraction. Couldn't we make the handlers.ExecuteRangeQueryHandle accept the api.ToolHandlerParams and here provide just the appropriate implementation for ToolCallRequest? It seems it only requires GetArguments to be implemented.

We could still keep the wrapper for the output, to keep the ToMCPResult and ToToolsetResult, though to avoid some weird stuff with different output depending on which way one runs the mcp server, I would be for unifying the output as much as possible as well.

iNecas · 2026-02-06T15:58:18Z

pkg/mcp/tools.go

-The 'query' parameter MUST use metric names that were returned by list_metrics.
-`),
+		mcp.WithDescription(prompts.ExecuteInstantQueryPrompt),
 		mcp.WithString("query",


Similarly with the duplication on the handlers params request. Could we use the toolets definitions as source of truth and use the WithRawInputSchema to convert it to the required format?

slashpai · 2026-02-06T18:58:50Z

.github/env

@@ -1,2 +1,2 @@
-golang-version=1.24
+golang-version=1.25


may be we can wait till ocp has go 1.25 else ci will fail

Do you know when OCP will have go 1.25?

I am still waiting for it for updating other downstream forks, probably by next week I hope

slashpai · 2026-02-09T06:39:46Z

triggering the openshift ci to see its working
/retest

openshift-ci · 2026-02-09T09:49:56Z

@saswatamcode: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-obs-mcp-gcp	`223c797`	link	false	`/test e2e-obs-mcp-gcp`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

slashpai · 2026-02-09T10:09:08Z

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/rhobs_obs-mcp/20/pull-ci-rhobs-obs-mcp-main-e2e-obs-mcp-gcp/2020749460262359040 failure due to go version

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

iNecas · 2026-02-09T10:49:37Z

pkg/tools/definitions.go

+
+// All tool definitions as a single source of truth
+var (
+	ListMetrics = ToolDef{


What about restructuring the packages a bit so that:

tooldef only contains the types and generic functionality to define the tools (but nothing about specific tool instance).

rename the pkg/handlers to pkg/tools/ where handlers would be just part (but also added the tool definitions and request input mappings)

the definitions move to pkg/tools/tools.go

the conversion functions from bind.go could move to pkg/tools/handlers.go (IMO it would read easier, as it's just a transformation to prepare for the expected handler input). I could imagine other places, but the key part is all the tool-specific things inside pkg/tools package.

also, the prompts could go to pkg/tools to have most of the real meat in one place, and the rest serving more as plumbing to serve it.

Ok I just removed tooldefs and prompts, in favor of a centralized tools package with the core stuff

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

iNecas

Thank you @saswatamcode

openshift-ci · 2026-02-09T12:37:44Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iNecas, saswatamcode

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [iNecas,saswatamcode]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

matzew · 2026-02-24T19:45:16Z

pkg/toolset/tools/prometheus_client.go

+	restConfig.TLSClientConfig = tlsConfig
+
+	// Create HTTP client with Kubernetes authentication
+	rt, err := rest.TransportFor(restConfig)


@saswatamcode I am getting:

"failed to get label names: error fetching label names: Post "https://thanos-querier.openshift-monitoring.svc:9091/api/v1/labels": failed to make request: AccessControlRoundTripper failed to get kind for gvr /v1, Resource=labels: no matches for /v1, Resource=labels"

with some hacks I got beyond that.

The rest.TransportFor(...) call seems to inherit the wrapped AccessControlRoundTripper from the Kubernetes MCP server.

While the build-in prometheus client did build its on http.Client, which carries only bearer tokens and
TLS settings.

See: https://github.com/openshift/openshift-mcp-server/blob/main/pkg/prometheus/client.go#L140

iNecas mentioned this pull request Jan 30, 2026

Use rhobs/obs-mcp toolset for Prometheus/Alertmanager (replaces observability mcp) openshift/openshift-mcp-server#124

Open

saswatamcode force-pushed the toolset branch from 6da3990 to ec9a0b0 Compare February 4, 2026 08:12

saswatamcode added 3 commits February 6, 2026 09:31

experiment: Expose MCP as toolset

f5c35e1

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

Add AM tools to toolset

86a97a5

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

Refactor packages to share code

9ab97fb

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

saswatamcode force-pushed the toolset branch from f1cfbf9 to 9ab97fb Compare February 6, 2026 09:31

Update Go

69eca43

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

saswatamcode marked this pull request as ready for review February 6, 2026 09:32

saswatamcode requested a review from a team February 6, 2026 09:32

saswatamcode changed the title ~~experiment: Expose MCP as toolset~~ Expose MCP as toolset, and move prompts and handlers to shared package Feb 6, 2026

Fix lint

223c797

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

iNecas reviewed Feb 6, 2026

View reviewed changes

slashpai reviewed Feb 6, 2026

View reviewed changes

Dedup tool definitions and input handling

cc6e9f6

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

openshift-ci bot added the approved label Feb 9, 2026

iNecas reviewed Feb 9, 2026

View reviewed changes

saswatamcode added 2 commits February 9, 2026 11:37

Restructure packages

25b185e

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

Lint

73739a5

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

iNecas approved these changes Feb 9, 2026

View reviewed changes

openshift-ci bot assigned iNecas Feb 9, 2026

openshift-ci bot added the lgtm label Feb 9, 2026

openshift-merge-bot bot merged commit 171c4ad into rhobs:main Feb 9, 2026
6 of 7 checks passed

matzew reviewed Feb 24, 2026

View reviewed changes

		@@ -1,2 +1,2 @@
		golang-version=1.24
		golang-version=1.25

Conversation

saswatamcode commented Jan 29, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

slashpai commented Feb 9, 2026

Uh oh!

openshift-ci bot commented Feb 9, 2026

Uh oh!

slashpai commented Feb 9, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iNecas left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Feb 9, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants