Consolidate kiali tools metrics and traces

Signed-off-by: Alberto Gutierrez <[email protected]>

Author: aljesusg

README.md

@@ -363,43 +363,23 @@ In case multi-cluster support is enabled (default) and you have access to multip
   - `namespace` (`string`) - Namespace containing the Istio object
   - `version` (`string`) - API version of the Istio object (e.g., 'v1', 'v1beta1')
 
-- **kiali_services_list** - Get all services in the mesh across specified namespaces with health and Istio resource information
+- **kiali_get_resource_details** - Gets lists or detailed info for Kubernetes resources (services, workloads) within the mesh
   - `namespaces` (`string`) - Comma-separated list of namespaces to get services from (e.g. 'bookinfo' or 'bookinfo,default'). If not provided, will list services from all accessible namespaces
+  - `resource_name` (`string`) - Name of the resource to get details for (optional string - if provided, gets details; if empty, lists all).
+  - `resource_type` (`string`) - Type of resource to get details for (service, workload)
 
-- **kiali_service_details** - Get detailed information for a specific service in a namespace, including validation, health status, and configuration
-  - `namespace` (`string`) **(required)** - Namespace containing the service
-  - `service` (`string`) **(required)** - Name of the service to get details for
-
-- **kiali_service_metrics** - Get metrics for a specific service in a namespace. Supports filtering by time range, direction (inbound/outbound), reporter, and other query parameters
-  - `byLabels` (`string`) - Comma-separated list of labels to group metrics by (e.g., 'source_workload,destination_service'). Optional
-  - `direction` (`string`) - Traffic direction: 'inbound' or 'outbound'. Optional, defaults to 'outbound'
-  - `duration` (`string`) - Duration of the query period in seconds (e.g., '1800' for 30 minutes). Optional, defaults to 1800 seconds
-  - `namespace` (`string`) **(required)** - Namespace containing the service
-  - `quantiles` (`string`) - Comma-separated list of quantiles for histogram metrics (e.g., '0.5,0.95,0.99'). Optional
-  - `rateInterval` (`string`) - Rate interval for metrics (e.g., '1m', '5m'). Optional, defaults to '1m'
-  - `reporter` (`string`) - Metrics reporter: 'source', 'destination', or 'both'. Optional, defaults to 'source'
-  - `requestProtocol` (`string`) - Filter by request protocol (e.g., 'http', 'grpc', 'tcp'). Optional
-  - `service` (`string`) **(required)** - Name of the service to get metrics for
-  - `step` (`string`) - Step between data points in seconds (e.g., '15'). Optional, defaults to 15 seconds
-
-- **kiali_workloads_list** - Get all workloads in the mesh across specified namespaces with health and Istio resource information
-  - `namespaces` (`string`) - Comma-separated list of namespaces to get workloads from (e.g. 'bookinfo' or 'bookinfo,default'). If not provided, will list workloads from all accessible namespaces
-
-- **kiali_workload_details** - Get detailed information for a specific workload in a namespace, including validation, health status, and configuration
-  - `namespace` (`string`) **(required)** - Namespace containing the workload
-  - `workload` (`string`) **(required)** - Name of the workload to get details for
-
-- **kiali_workload_metrics** - Get metrics for a specific workload in a namespace. Supports filtering by time range, direction (inbound/outbound), reporter, and other query parameters
+- **kiali_get_metrics** - Gets lists or detailed info for Kubernetes resources (services, workloads) within the mesh
   - `byLabels` (`string`) - Comma-separated list of labels to group metrics by (e.g., 'source_workload,destination_service'). Optional
   - `direction` (`string`) - Traffic direction: 'inbound' or 'outbound'. Optional, defaults to 'outbound'
-  - `duration` (`string`) - Duration of the query period in seconds (e.g., '1800' for 30 minutes). Optional, defaults to 1800 seconds
-  - `namespace` (`string`) **(required)** - Namespace containing the workload
+  - `duration` (`string`) - Time range to get metrics for (optional string - if provided, gets metrics; if empty, get default 1800s).
+  - `namespace` (`string`) **(required)** - Namespace to get resources from
   - `quantiles` (`string`) - Comma-separated list of quantiles for histogram metrics (e.g., '0.5,0.95,0.99'). Optional
   - `rateInterval` (`string`) - Rate interval for metrics (e.g., '1m', '5m'). Optional, defaults to '1m'
   - `reporter` (`string`) - Metrics reporter: 'source', 'destination', or 'both'. Optional, defaults to 'source'
   - `requestProtocol` (`string`) - Filter by request protocol (e.g., 'http', 'grpc', 'tcp'). Optional
+  - `resource_name` (`string`) **(required)** - Name of the resource to get details for (optional string - if provided, gets details; if empty, lists all).
+  - `resource_type` (`string`) **(required)** - Type of resource to get details for (service, workload)
   - `step` (`string`) - Step between data points in seconds (e.g., '15'). Optional, defaults to 15 seconds
-  - `workload` (`string`) **(required)** - Name of the workload to get metrics for
 
 - **workload_logs** - Get logs for a specific workload's pods in a namespace. Only requires namespace and workload name - automatically discovers pods and containers. Optionally filter by container name, time range, and other parameters. Container is auto-detected if not specified.
   - `container` (`string`) - Optional container name to filter logs. If not provided, automatically detects and uses the main application container (excludes istio-proxy and istio-init)
@@ -408,35 +388,16 @@ In case multi-cluster support is enabled (default) and you have access to multip
   - `tail` (`integer`) - Number of lines to retrieve from the end of logs (default: 100)
   - `workload` (`string`) **(required)** - Name of the workload to get logs for
 
-- **kiali_app_traces** - Get distributed tracing data for a specific app in a namespace. Returns trace information including spans, duration, and error details for troubleshooting and performance analysis.
-  - `app` (`string`) **(required)** - Name of the app to get traces for
-  - `clusterName` (`string`) - Cluster name for multi-cluster environments (optional)
-  - `endMicros` (`string`) - End time for traces in microseconds since epoch (optional)
-  - `limit` (`integer`) - Maximum number of traces to return (default: 100)
-  - `minDuration` (`integer`) - Minimum trace duration in microseconds (optional)
-  - `namespace` (`string`) **(required)** - Namespace containing the app
-  - `startMicros` (`string`) - Start time for traces in microseconds since epoch (optional)
-  - `tags` (`string`) - JSON string of tags to filter traces (optional)
-
-- **kiali_service_traces** - Get distributed tracing data for a specific service in a namespace. Returns trace information including spans, duration, and error details for troubleshooting and performance analysis.
-  - `clusterName` (`string`) - Cluster name for multi-cluster environments (optional)
-  - `endMicros` (`string`) - End time for traces in microseconds since epoch (optional)
-  - `limit` (`integer`) - Maximum number of traces to return (default: 100)
-  - `minDuration` (`integer`) - Minimum trace duration in microseconds (optional)
-  - `namespace` (`string`) **(required)** - Namespace containing the service
-  - `service` (`string`) **(required)** - Name of the service to get traces for
-  - `startMicros` (`string`) - Start time for traces in microseconds since epoch (optional)
-  - `tags` (`string`) - JSON string of tags to filter traces (optional)
-
-- **kiali_workload_traces** - Get distributed tracing data for a specific workload in a namespace. Returns trace information including spans, duration, and error details for troubleshooting and performance analysis.
+- **kiali_get_traces** - Gets traces for a specific resource (app, service, workload) in a namespace
   - `clusterName` (`string`) - Cluster name for multi-cluster environments (optional)
   - `endMicros` (`string`) - End time for traces in microseconds since epoch (optional)
   - `limit` (`integer`) - Maximum number of traces to return (default: 100)
   - `minDuration` (`integer`) - Minimum trace duration in microseconds (optional)
-  - `namespace` (`string`) **(required)** - Namespace containing the workload
+  - `namespace` (`string`) **(required)** - Namespace to get resources from
+  - `resource_name` (`string`) **(required)** - Name of the resource to get details for (optional string - if provided, gets details; if empty, lists all).
+  - `resource_type` (`string`) **(required)** - Type of resource to get metrics for (app, service, workload)
   - `startMicros` (`string`) - Start time for traces in microseconds since epoch (optional)
   - `tags` (`string`) - JSON string of tags to filter traces (optional)
-  - `workload` (`string`) **(required)** - Name of the workload to get traces for
 
 </details>
 

pkg/toolsets/kiali/get_mesh_graph.go

@@ -10,7 +10,7 @@ import (
 	"github.com/containers/kubernetes-mcp-server/pkg/api"
 )
 
-func GetMeshGraph() []api.ServerTool {
+func initGetMeshGraph() []api.ServerTool {
 	ret := make([]api.ServerTool, 0)
 	ret = append(ret, api.ServerTool{
 		Tool: api.Tool{

pkg/toolsets/kiali/get_metrics.go

@@ -0,0 +1,164 @@
+package kiali
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/google/jsonschema-go/jsonschema"
+	"k8s.io/utils/ptr"
+
+	"github.com/containers/kubernetes-mcp-server/pkg/api"
+	kialiclient "github.com/containers/kubernetes-mcp-server/pkg/kiali"
+)
+
+type resourceOperations struct {
+	singularName string
+	metricsFunc  func(ctx context.Context, k *kialiclient.Kiali, namespace, name string, queryParams map[string]string) (string, error)
+}
+
+var opsMap = map[string]resourceOperations{
+	"service": {
+		singularName: "service",
+		metricsFunc: func(ctx context.Context, k *kialiclient.Kiali, ns, name string, queryParams map[string]string) (string, error) {
+			return k.ServiceMetrics(ctx, ns, name, queryParams)
+		},
+	},
+	"workload": {
+		singularName: "workload",
+		metricsFunc: func(ctx context.Context, k *kialiclient.Kiali, ns, name string, queryParams map[string]string) (string, error) {
+			return k.WorkloadMetrics(ctx, ns, name, queryParams)
+		},
+	},
+}
+
+func initGetMetrics() []api.ServerTool {
+	ret := make([]api.ServerTool, 0)
+
+	ret = append(ret, api.ServerTool{
+		Tool: api.Tool{
+			Name:        "kiali_get_metrics",
+			Description: "Gets lists or detailed info for Kubernetes resources (services, workloads) within the mesh",
+			InputSchema: &jsonschema.Schema{
+				Type: "object",
+				Properties: map[string]*jsonschema.Schema{
+					"resource_type": {
+						Type:        "string",
+						Description: "Type of resource to get details for (service, workload)",
+						Enum:        []any{"service", "workload"},
+					},
+					"namespace": {
+						Type:        "string",
+						Description: "Namespace to get resources from",
+					},
+					"resource_name": {
+						Type:        "string",
+						Description: "Name of the resource to get details for (optional string - if provided, gets details; if empty, lists all).",
+					},
+					"duration": {
+						Type:        "string",
+						Description: "Time range to get metrics for (optional string - if provided, gets metrics; if empty, get default 1800s).",
+					},
+					"step": {
+						Type:        "string",
+						Description: "Step between data points in seconds (e.g., '15'). Optional, defaults to 15 seconds",
+					},
+					"rateInterval": {
+						Type:        "string",
+						Description: "Rate interval for metrics (e.g., '1m', '5m'). Optional, defaults to '1m'",
+					},
+					"direction": {
+						Type:        "string",
+						Description: "Traffic direction: 'inbound' or 'outbound'. Optional, defaults to 'outbound'",
+					},
+					"reporter": {
+						Type:        "string",
+						Description: "Metrics reporter: 'source', 'destination', or 'both'. Optional, defaults to 'source'",
+					},
+					"requestProtocol": {
+						Type:        "string",
+						Description: "Filter by request protocol (e.g., 'http', 'grpc', 'tcp'). Optional",
+					},
+					"quantiles": {
+						Type:        "string",
+						Description: "Comma-separated list of quantiles for histogram metrics (e.g., '0.5,0.95,0.99'). Optional",
+					},
+					"byLabels": {
+						Type:        "string",
+						Description: "Comma-separated list of labels to group metrics by (e.g., 'source_workload,destination_service'). Optional",
+					},
+				},
+				Required: []string{"resource_type", "namespace", "resource_name"},
+			},
+			Annotations: api.ToolAnnotations{
+				Title:           "Get Metrics for a Resource",
+				ReadOnlyHint:    ptr.To(true),
+				DestructiveHint: ptr.To(false),
+				IdempotentHint:  ptr.To(true),
+				OpenWorldHint:   ptr.To(true),
+			},
+		}, Handler: resourceMetricsHandler,
+	})
+
+	return ret
+}
+
+func resourceMetricsHandler(params api.ToolHandlerParams) (*api.ToolCallResult, error) {
+	// Extract parameters
+	resourceType, _ := params.GetArguments()["resource_type"].(string)
+	namespace, _ := params.GetArguments()["namespace"].(string)
+	resourceName, _ := params.GetArguments()["resource_name"].(string)
+
+	resourceType = strings.ToLower(strings.TrimSpace(resourceType))
+	namespace = strings.TrimSpace(namespace)
+	resourceName = strings.TrimSpace(resourceName)
+
+	if resourceType == "" {
+		return api.NewToolCallResult("", fmt.Errorf("resource_type is required")), nil
+	}
+	if namespace == "" || len(strings.Split(namespace, ",")) != 1 {
+		return api.NewToolCallResult("", fmt.Errorf("namespace is required")), nil
+	}
+	if resourceName == "" {
+		return api.NewToolCallResult("", fmt.Errorf("resource_name is required")), nil
+	}
+
+	ops, ok := opsMap[resourceType]
+	if !ok {
+		return api.NewToolCallResult("", fmt.Errorf("invalid resource type: %s", resourceType)), nil
+	}
+
+	queryParams := make(map[string]string)
+	if duration, ok := params.GetArguments()["duration"].(string); ok && duration != "" {
+		queryParams["duration"] = duration
+	}
+	if step, ok := params.GetArguments()["step"].(string); ok && step != "" {
+		queryParams["step"] = step
+	}
+	if rateInterval, ok := params.GetArguments()["rateInterval"].(string); ok && rateInterval != "" {
+		queryParams["rateInterval"] = rateInterval
+	}
+	if direction, ok := params.GetArguments()["direction"].(string); ok && direction != "" {
+		queryParams["direction"] = direction
+	}
+	if reporter, ok := params.GetArguments()["reporter"].(string); ok && reporter != "" {
+		queryParams["reporter"] = reporter
+	}
+	if requestProtocol, ok := params.GetArguments()["requestProtocol"].(string); ok && requestProtocol != "" {
+		queryParams["requestProtocol"] = requestProtocol
+	}
+	if quantiles, ok := params.GetArguments()["quantiles"].(string); ok && quantiles != "" {
+		queryParams["quantiles"] = quantiles
+	}
+	if byLabels, ok := params.GetArguments()["byLabels"].(string); ok && byLabels != "" {
+		queryParams["byLabels"] = byLabels
+	}
+
+	k := params.NewKiali()
+
+	content, err := ops.metricsFunc(params.Context, k, namespace, resourceName, queryParams)
+	if err != nil {
+		return api.NewToolCallResult("", fmt.Errorf("failed to get %s metrics: %v", ops.singularName, err)), nil
+	}
+	return api.NewToolCallResult(content, nil), nil
+}

pkg/toolsets/kiali/get_resource_details.go

@@ -0,0 +1,119 @@
+package kiali
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/google/jsonschema-go/jsonschema"
+	"k8s.io/utils/ptr"
+
+	"github.com/containers/kubernetes-mcp-server/pkg/api"
+	kialiclient "github.com/containers/kubernetes-mcp-server/pkg/kiali"
+)
+
+type listDetailsOperations struct {
+	singularName string
+	listFunc     func(ctx context.Context, k *kialiclient.Kiali, namespaces string) (string, error)
+	detailsFunc  func(ctx context.Context, k *kialiclient.Kiali, namespace, name string) (string, error)
+}
+
+var listDetailsOpsMap = map[string]listDetailsOperations{
+	"service": {
+		singularName: "service",
+		listFunc: func(ctx context.Context, k *kialiclient.Kiali, nss string) (string, error) {
+			return k.ServicesList(ctx, nss)
+		},
+		detailsFunc: func(ctx context.Context, k *kialiclient.Kiali, ns, name string) (string, error) {
+			return k.ServiceDetails(ctx, ns, name)
+		},
+	},
+	"workload": {
+		singularName: "workload",
+		listFunc: func(ctx context.Context, k *kialiclient.Kiali, nss string) (string, error) {
+			return k.WorkloadsList(ctx, nss)
+		},
+		detailsFunc: func(ctx context.Context, k *kialiclient.Kiali, ns, name string) (string, error) {
+			return k.WorkloadDetails(ctx, ns, name)
+		},
+	},
+}
+
+func initGetResourceDetails() []api.ServerTool {
+	ret := make([]api.ServerTool, 0)
+
+	ret = append(ret, api.ServerTool{
+		Tool: api.Tool{
+			Name:        "kiali_get_resource_details",
+			Description: "Gets lists or detailed info for Kubernetes resources (services, workloads) within the mesh",
+			InputSchema: &jsonschema.Schema{
+				Type: "object",
+				Properties: map[string]*jsonschema.Schema{
+					"resource_type": {
+						Type:        "string",
+						Description: "Type of resource to get details for (service, workload)",
+						Enum:        []any{"service", "workload"},
+					},
+					"namespaces": {
+						Type:        "string",
+						Description: "Comma-separated list of namespaces to get services from (e.g. 'bookinfo' or 'bookinfo,default'). If not provided, will list services from all accessible namespaces",
+					},
+					"resource_name": {
+						Type:        "string",
+						Description: "Name of the resource to get details for (optional string - if provided, gets details; if empty, lists all).",
+					},
+				},
+			},
+			Annotations: api.ToolAnnotations{
+				Title:           "List or Resource Details",
+				ReadOnlyHint:    ptr.To(true),
+				DestructiveHint: ptr.To(false),
+				IdempotentHint:  ptr.To(true),
+				OpenWorldHint:   ptr.To(true),
+			},
+		}, Handler: resourceDetailsHandler,
+	})
+
+	return ret
+}
+
+func resourceDetailsHandler(params api.ToolHandlerParams) (*api.ToolCallResult, error) {
+	// Extract parameters
+	resourceType, _ := params.GetArguments()["resource_type"].(string)
+	namespaces, _ := params.GetArguments()["namespaces"].(string)
+	resourceName, _ := params.GetArguments()["resource_name"].(string)
+
+	resourceType = strings.ToLower(strings.TrimSpace(resourceType))
+	namespaces = strings.TrimSpace(namespaces)
+	resourceName = strings.TrimSpace(resourceName)
+
+	if resourceType == "" {
+		return api.NewToolCallResult("", fmt.Errorf("resource_type is required")), nil
+	}
+
+	k := params.NewKiali()
+
+	ops, ok := listDetailsOpsMap[resourceType]
+	if !ok {
+		return api.NewToolCallResult("", fmt.Errorf("invalid resource type: %s", resourceType)), nil
+	}
+
+	// If a resource name is provided, fetch details. Requires exactly one namespace.
+	if resourceName != "" {
+		if count := len(strings.Split(namespaces, ",")); count != 1 {
+			return api.NewToolCallResult("", fmt.Errorf("exactly one namespace must be provided for %s details", ops.singularName)), nil
+		}
+		content, err := ops.detailsFunc(params.Context, k, namespaces, resourceName)
+		if err != nil {
+			return api.NewToolCallResult("", fmt.Errorf("failed to get %s details: %v", ops.singularName, err)), nil
+		}
+		return api.NewToolCallResult(content, nil), nil
+	}
+
+	// Otherwise, list resources (supports multiple namespaces)
+	content, err := ops.listFunc(params.Context, k, namespaces)
+	if err != nil {
+		return api.NewToolCallResult("", fmt.Errorf("failed to list %ss: %v", ops.singularName, err)), nil
+	}
+	return api.NewToolCallResult(content, nil), nil
+}