feat(kiali): Possibility of renaming Kiali in the downstream distribution

aljesusg · aljesusg · commit ea4952dfcd6d · 2025-12-01T16:03:00.000+01:00
Signed-off-by: Alberto Gutierrez &lt;aljesusg@gmail.com&gt;
diff --git a/pkg/mcp/testdata/toolsets-kiali-tools.json b/pkg/mcp/testdata/toolsets-kiali-tools.json
@@ -30,7 +30,85 @@
         }
       }
     },
-    "name": "kiali_get_mesh_graph"
+    "name": "kiali_graph"
+  },
+  {
+    "annotations": {
+      "title": "Manage Istio Config: List, Get, Create, Patch, Delete",
+      "destructiveHint": true,
+      "idempotentHint": true,
+      "openWorldHint": true
+    },
+    "description": "Manages Istio configuration objects (Gateways, VirtualServices, etc.). Can list (objects and validations), get, create, patch, or delete objects",
+    "inputSchema": {
+      "type": "object",
+      "properties": {
+        "action": {
+          "description": "Action to perform: list, get, create, patch, or delete",
+          "type": "string"
+        },
+        "group": {
+          "description": "API group of the Istio object (e.g., 'networking.istio.io', 'gateway.networking.k8s.io')",
+          "type": "string"
+        },
+        "json_data": {
+          "description": "JSON data to apply or create the object",
+          "type": "string"
+        },
+        "kind": {
+          "description": "Kind of the Istio object (e.g., 'DestinationRule', 'VirtualService', 'HTTPRoute', 'Gateway')",
+          "type": "string"
+        },
+        "name": {
+          "description": "Name of the Istio object",
+          "type": "string"
+        },
+        "namespace": {
+          "description": "Namespace containing the Istio object",
+          "type": "string"
+        },
+        "version": {
+          "description": "API version of the Istio object (e.g., 'v1', 'v1beta1')",
+          "type": "string"
+        }
+      },
+      "required": [
+        "action"
+      ]
+    },
+    "name": "kiali_istio_object"
+  },
+  {
+    "annotations": {
+      "title": "List or Resource Details",
+      "readOnlyHint": true,
+      "destructiveHint": false,
+      "idempotentHint": true,
+      "openWorldHint": true
+    },
+    "description": "Gets lists or detailed info for Kubernetes resources (services, workloads) within the mesh",
+    "inputSchema": {
+      "type": "object",
+      "properties": {
+        "namespaces": {
+          "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",
+          "type": "string"
+        },
+        "resource_name": {
+          "description": "Name of the resource to get details for (optional string - if provided, gets details; if empty, lists all).",
+          "type": "string"
+        },
+        "resource_type": {
+          "description": "Type of resource to get details for (service, workload)",
+          "enum": [
+            "service",
+            "workload"
+          ],
+          "type": "string"
+        }
+      }
+    },
+    "name": "kiali_service_workload"
   },
   {
     "annotations": {
@@ -105,39 +183,7 @@
         "resource_name"
       ]
     },
-    "name": "kiali_get_metrics"
-  },
-  {
-    "annotations": {
-      "title": "List or Resource Details",
-      "readOnlyHint": true,
-      "destructiveHint": false,
-      "idempotentHint": true,
-      "openWorldHint": true
-    },
-    "description": "Gets lists or detailed info for Kubernetes resources (services, workloads) within the mesh",
-    "inputSchema": {
-      "type": "object",
-      "properties": {
-        "namespaces": {
-          "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",
-          "type": "string"
-        },
-        "resource_name": {
-          "description": "Name of the resource to get details for (optional string - if provided, gets details; if empty, lists all).",
-          "type": "string"
-        },
-        "resource_type": {
-          "description": "Type of resource to get details for (service, workload)",
-          "enum": [
-            "service",
-            "workload"
-          ],
-          "type": "string"
-        }
-      }
-    },
-    "name": "kiali_get_resource_details"
+    "name": "kiali_service_workload_metrics"
   },
   {
     "annotations": {
@@ -201,53 +247,7 @@
         }
       }
     },
-    "name": "kiali_get_traces"
-  },
-  {
-    "annotations": {
-      "title": "Manage Istio Config: List, Get, Create, Patch, Delete",
-      "destructiveHint": true,
-      "idempotentHint": true,
-      "openWorldHint": true
-    },
-    "description": "Manages Istio configuration objects (Gateways, VirtualServices, etc.). Can list (objects and validations), get, create, patch, or delete objects",
-    "inputSchema": {
-      "type": "object",
-      "properties": {
-        "action": {
-          "description": "Action to perform: list, get, create, patch, or delete",
-          "type": "string"
-        },
-        "group": {
-          "description": "API group of the Istio object (e.g., 'networking.istio.io', 'gateway.networking.k8s.io')",
-          "type": "string"
-        },
-        "json_data": {
-          "description": "JSON data to apply or create the object",
-          "type": "string"
-        },
-        "kind": {
-          "description": "Kind of the Istio object (e.g., 'DestinationRule', 'VirtualService', 'HTTPRoute', 'Gateway')",
-          "type": "string"
-        },
-        "name": {
-          "description": "Name of the Istio object",
-          "type": "string"
-        },
-        "namespace": {
-          "description": "Namespace containing the Istio object",
-          "type": "string"
-        },
-        "version": {
-          "description": "API version of the Istio object (e.g., 'v1', 'v1beta1')",
-          "type": "string"
-        }
-      },
-      "required": [
-        "action"
-      ]
-    },
-    "name": "kiali_manage_istio_config"
+    "name": "kiali_traces"
   },
   {
     "annotations": {
@@ -287,6 +287,6 @@
         "workload"
       ]
     },
-    "name": "workload_logs"
+    "name": "kiali_workload_logs"
   }
 ]
diff --git a/pkg/toolsets/kiali/internal/defaults/defaults.go b/pkg/toolsets/kiali/internal/defaults/defaults.go
@@ -0,0 +1,22 @@
+package defaults
+
+const (
+	DefaultToolsetName        = "kiali"
+	DefaultToolsetDescription = "Most common tools for managing Kiali, check the [Kiali documentation](https://github.com/containers/kubernetes-mcp-server/blob/main/docs/KIALI.md) for more details."
+)
+
+func ToolsetName() string {
+	overrideName := ToolsetNameOverride()
+	if overrideName != "" {
+		return overrideName
+	}
+	return DefaultToolsetName
+}
+
+func ToolsetDescription() string {
+	overrideDescription := ToolsetDescriptionOverride()
+	if overrideDescription != "" {
+		return overrideDescription
+	}
+	return DefaultToolsetDescription
+}
diff --git a/pkg/toolsets/kiali/internal/defaults/defaults_override.go b/pkg/toolsets/kiali/internal/defaults/defaults_override.go
@@ -0,0 +1,14 @@
+package defaults
+
+const (
+	toolsetNameOverride        = ""
+	toolsetDescriptionOverride = ""
+)
+
+func ToolsetNameOverride() string {
+	return toolsetNameOverride
+}
+
+func ToolsetDescriptionOverride() string {
+	return toolsetDescriptionOverride
+}
diff --git a/pkg/toolsets/kiali/tools/get_mesh_graph.go b/pkg/toolsets/kiali/tools/get_mesh_graph.go
@@ -1,4 +1,4 @@
-package kiali
+package tools
 
 import (
 	"fmt"
@@ -9,13 +9,15 @@ import (
 
 	"github.com/containers/kubernetes-mcp-server/pkg/api"
 	kialiclient "github.com/containers/kubernetes-mcp-server/pkg/kiali"
+	"github.com/containers/kubernetes-mcp-server/pkg/toolsets/kiali/internal/defaults"
 )
 
-func initGetMeshGraph() []api.ServerTool {
+func InitGetMeshGraph() []api.ServerTool {
 	ret := make([]api.ServerTool, 0)
+	name := defaults.ToolsetName() + "_graph"
 	ret = append(ret, api.ServerTool{
 		Tool: api.Tool{
-			Name:        "kiali_get_mesh_graph",
+			Name:        name,
 			Description: "Returns the topology of a specific namespaces, health, status of the mesh and namespaces. Includes a mesh health summary overview with aggregated counts of healthy, degraded, and failing apps, workloads, and services. Use this for high-level overviews",
 			InputSchema: &jsonschema.Schema{
 				Type: "object",
diff --git a/pkg/toolsets/kiali/tools/get_metrics.go b/pkg/toolsets/kiali/tools/get_metrics.go
@@ -1,4 +1,4 @@
-package kiali
+package tools
 
 import (
 	"context"
@@ -10,6 +10,7 @@ import (
 
 	"github.com/containers/kubernetes-mcp-server/pkg/api"
 	kialiclient "github.com/containers/kubernetes-mcp-server/pkg/kiali"
+	"github.com/containers/kubernetes-mcp-server/pkg/toolsets/kiali/internal/defaults"
 )
 
 type resourceOperations struct {
@@ -32,12 +33,12 @@ var opsMap = map[string]resourceOperations{
 	},
 }
 
-func initGetMetrics() []api.ServerTool {
+func InitGetMetrics() []api.ServerTool {
 	ret := make([]api.ServerTool, 0)
-
+	name := defaults.ToolsetName() + "_service_workload_metrics"
 	ret = append(ret, api.ServerTool{
 		Tool: api.Tool{
-			Name:        "kiali_get_metrics",
+			Name:        name,
 			Description: "Gets lists or detailed info for Kubernetes resources (services, workloads) within the mesh",
 			InputSchema: &jsonschema.Schema{
 				Type: "object",
diff --git a/pkg/toolsets/kiali/tools/get_resource_details.go b/pkg/toolsets/kiali/tools/get_resource_details.go
@@ -1,4 +1,4 @@
-package kiali
+package tools
 
 import (
 	"context"
@@ -10,6 +10,7 @@ import (
 
 	"github.com/containers/kubernetes-mcp-server/pkg/api"
 	kialiclient "github.com/containers/kubernetes-mcp-server/pkg/kiali"
+	"github.com/containers/kubernetes-mcp-server/pkg/toolsets/kiali/internal/defaults"
 )
 
 type listDetailsOperations struct {
@@ -39,12 +40,12 @@ var listDetailsOpsMap = map[string]listDetailsOperations{
 	},
 }
 
-func initGetResourceDetails() []api.ServerTool {
+func InitGetResourceDetails() []api.ServerTool {
 	ret := make([]api.ServerTool, 0)
-
+	name := defaults.ToolsetName() + "_service_workload"
 	ret = append(ret, api.ServerTool{
 		Tool: api.Tool{
-			Name:        "kiali_get_resource_details",
+			Name:        name,
 			Description: "Gets lists or detailed info for Kubernetes resources (services, workloads) within the mesh",
 			InputSchema: &jsonschema.Schema{
 				Type: "object",
diff --git a/pkg/toolsets/kiali/tools/get_traces.go b/pkg/toolsets/kiali/tools/get_traces.go
@@ -1,4 +1,4 @@
-package kiali
+package tools
 
 import (
 	"context"
@@ -12,6 +12,7 @@ import (
 
 	"github.com/containers/kubernetes-mcp-server/pkg/api"
 	kialiclient "github.com/containers/kubernetes-mcp-server/pkg/kiali"
+	"github.com/containers/kubernetes-mcp-server/pkg/toolsets/kiali/internal/defaults"
 )
 
 type tracesOperations struct {
@@ -40,12 +41,12 @@ var tracesOpsMap = map[string]tracesOperations{
 	},
 }
 
-func initGetTraces() []api.ServerTool {
+func InitGetTraces() []api.ServerTool {
 	ret := make([]api.ServerTool, 0)
-
+	name := defaults.ToolsetName() + "_traces"
 	ret = append(ret, api.ServerTool{
 		Tool: api.Tool{
-			Name:        "kiali_get_traces",
+			Name:        name,
 			Description: "Gets traces for a specific resource (app, service, workload) in a namespace, or gets detailed information for a specific trace by its ID. If traceId is provided, it returns detailed trace information and other parameters are not required.",
 			InputSchema: &jsonschema.Schema{
 				Type: "object",
diff --git a/pkg/toolsets/kiali/tools/helpers.go b/pkg/toolsets/kiali/tools/helpers.go
@@ -1,4 +1,4 @@
-package kiali
+package tools
 
 import (
 	"encoding/json"
diff --git a/pkg/toolsets/kiali/tools/helpers_test.go b/pkg/toolsets/kiali/tools/helpers_test.go
@@ -1,4 +1,4 @@
-package kiali
+package tools
 
 import (
 	"encoding/json"
diff --git a/pkg/toolsets/kiali/tools/logs.go b/pkg/toolsets/kiali/tools/logs.go
@@ -1,4 +1,4 @@
-package kiali
+package tools
 
 import (
 	"encoding/json"
@@ -8,15 +8,16 @@ import (
 	"k8s.io/utils/ptr"
 
 	"github.com/containers/kubernetes-mcp-server/pkg/api"
+	"github.com/containers/kubernetes-mcp-server/pkg/toolsets/kiali/internal/defaults"
 )
 
-func initLogs() []api.ServerTool {
+func InitLogs() []api.ServerTool {
 	ret := make([]api.ServerTool, 0)
-
+	name := defaults.ToolsetName() + "_workload_logs"
 	// Workload logs tool
 	ret = append(ret, api.ServerTool{
 		Tool: api.Tool{
-			Name:        "workload_logs",
+			Name:        name,
 			Description: "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.",
 			InputSchema: &jsonschema.Schema{
 				Type: "object",
diff --git a/pkg/toolsets/kiali/tools/manage_istio_config.go b/pkg/toolsets/kiali/tools/manage_istio_config.go
diff --git a/pkg/toolsets/kiali/toolset.go b/pkg/toolsets/kiali/toolset.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package kiali`
	`1`	`+package tools`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`