chore: Register Inspektor Gadget tool by default

Signed-off-by: Qasim Sarfraz <[email protected]>

Author: mqasimsarfraz

README.md

@@ -198,15 +198,15 @@ require explicit enablement via `--additional-tools`*
 <details>
 <summary>Real-time Observability</summary>
 
-**Tool:** `inspektor_gadget` *(requires `--additional-tools inspektor-gadget`)*
+**Tool:** `inspektor_gadget_observability`
 
 Real-time observability tool for Azure Kubernetes Service (AKS) clusters using
 eBPF.
 
 **Available Actions:**
 
-- `deploy`: Deploy Inspektor Gadget to cluster
-- `undeploy`: Remove Inspektor Gadget from cluster
+- `deploy`: Deploy Inspektor Gadget to cluster (requires `readwrite`/`admin` access)
+- `undeploy`: Remove Inspektor Gadget from cluster (requires `readwrite`/`admin` access)
 - `is_deployed`: Check deployment status
 - `run`: Run one-shot gadgets
 - `start`: Start continuous gadgets
@@ -407,7 +407,7 @@ Command line arguments:
 ```sh
 Usage of ./aks-mcp:
       --access-level string       Access level (readonly, readwrite, admin) (default "readonly")
-      --additional-tools string   Comma-separated list of additional Kubernetes tools to support (kubectl is always enabled). Available: helm,cilium,inspektor-gadget
+      --additional-tools string   Comma-separated list of additional Kubernetes tools to support (kubectl is always enabled). Available: helm,cilium
       --allow-namespaces string   Comma-separated list of allowed Kubernetes namespaces (empty means all namespaces)
       --host string               Host to listen for the server (only used with transport sse or streamable-http) (default "127.0.0.1")
       --port int                  Port to listen for the server (only used with transport sse or streamable-http) (default 8000)

docs/inspektor-gadget-usage.md

@@ -1,11 +1,11 @@
-# Inspektor Gadget Tool Usage
+# Inspektor Gadget Observability Tool Usage in AKS-MCP Server
 
-This document gives an overview of `inspektor_gadget` tool in the AKS-MCP server.
+This document gives an overview of `inspektor_gadget_observability` tool in the AKS-MCP server.
 
 ## Tool Overview
 
 The [Inspektor Gadget](https://go.microsoft.com/fwlink/?linkid=2260072) tool allows users to run various diagnostics and inspections on Kubernetes clusters.
-It uses gadgets to collect real-time data with Kubernetes enrichment. `inspektor_gadget` MCP tool essentially allows managing the gadgets, enabling users to 
+It uses gadgets to collect real-time data with Kubernetes enrichment. `inspektor_gadget_observability` MCP tool essentially allows managing the gadgets, enabling users to
 run diagnostics, collect data, and analyze workloads in a Kubernetes environment. It currently supports the following actions:
 
 - **start**: Start a gadget to collect data continuously
@@ -35,7 +35,7 @@ to get the most relevant data for your workload.
 
 ## Sample Prompts
 
-Following are some sample prompts that can be used with to quickly try `inspektor_gadget` tool in the AKS-MCP server:
+Following are some sample prompts that can be used with to quickly try `inspektor_gadget_observability` tool in the AKS-MCP server:
 
 ```
 Can you check if any DNS queries are failing in AKS cluster?
@@ -68,12 +68,13 @@ Can you observe system calls for the pod my-pod in the default namespace for few
 ## Prerequisites
 
 - A kubeconfig file that has access to the AKS cluster. You will need to restart the MCP server if you change the kubeconfig file.
-- Ensure the AKS MCP server is running with the `--additional-tools=inspektor-gadget`.
-- The tool requires Inspektor Gadget to be installed in the cluster. If you are running with `--additional-tools=inspektor-gadget` and `--access-level=readwrite` or more, the MCP server will automatically 
+- The tool requires Inspektor Gadget to be installed in the cluster. If you are running with `--access-level=readwrite` or more, the MCP server will automatically
   install Inspektor Gadget (action `deploy` ) in the cluster otherwise you can follow the steps to install it manually: [Inspektor Gadget Installation](https://learn.microsoft.com/en-us/troubleshoot/azure/azure-kubernetes/logs/capture-system-insights-from-aks#how-to-install-inspektor-gadget-in-an-aks-cluster) or
   use the official Helm chart: [Inspektor Gadget Helm Chart](https://inspektor-gadget.io/docs/latest/reference/install-kubernetes#installation-with-the-helm-chart):
 
 ```bash
 IG_VERSION=$(curl -s https://api.github.com/repos/inspektor-gadget/inspektor-gadget/releases/latest | jq -r '.tag_name' | sed 's/^v//')
 helm install gadget --namespace=gadget --create-namespace oci://ghcr.io/inspektor-gadget/inspektor-gadget/charts/gadget --version=$IG_VERSION
 ```
+
+Once Inspektor Gadget is deployed (or you installed it manually), you only need `readonly` (default) access to use the `inspektor_gadget_observability` tool.

internal/components/inspektorgadget/handlers.go

@@ -16,7 +16,7 @@ import (
 // Inspektor Gadget Handler
 // =============================================================================
 
-var ErrNotDeployed = fmt.Errorf("inspektor gadget is not deployed, please deploy it first e.g. using 'inspektor_gadget' (action: deploy) tool (requires 'readwrite' or 'admin' access level)")
+var ErrNotDeployed = fmt.Errorf("inspektor gadget is not deployed, please deploy it first e.g. using 'inspektor_gadget_observability' (action: deploy) tool (requires 'readwrite' or 'admin' access level)")
 
 // InspektorGadgetHandler returns a handler to manage gadgets
 func InspektorGadgetHandler(mgr GadgetManager, cfg *config.ConfigData) tools.ResourceHandler {

internal/components/inspektorgadget/registry.go

@@ -9,7 +9,7 @@ import "github.com/mark3labs/mcp-go/mcp"
 // RegisterInspektorGadgetTool registers the inspektor-gadget tool to manage gadgets
 func RegisterInspektorGadgetTool() mcp.Tool {
 	return mcp.NewTool(
-		"inspektor_gadget",
+		"inspektor_gadget_observability",
 		mcp.WithDescription("Real-time observability tool for Azure Kubernetes Service (AKS) clusters, allowing users to manage gadgets for monitoring and debugging"),
 		mcp.WithString("action",
 			mcp.Required(),
@@ -56,7 +56,7 @@ func RegisterInspektorGadgetTool() mcp.Tool {
 					map[string]any{
 						"namespace": map[string]any{
 							"type":        "string",
-							"description": "Kubernetes namespace",
+							"description": "Kubernetes namespace, leave empty to use all namespaces",
 						},
 						"pod": map[string]any{
 							"type":        "string",

internal/components/inspektorgadget/registry_test.go

@@ -4,8 +4,8 @@ import "testing"
 
 func TestRegisterInspektorGadgetTool(t *testing.T) {
 	tool := RegisterInspektorGadgetTool()
-	if tool.Name != "inspektor_gadget" {
-		t.Errorf("Expected tool name 'inspektor_gadget', got '%s'", tool.Name)
+	if tool.Name != "inspektor_gadget_observability" {
+		t.Errorf("Expected tool name 'inspektor_gadget_observability', got '%s'", tool.Name)
 	}
 
 	if tool.Description == "" {

internal/config/config.go

@@ -24,7 +24,7 @@ type ConfigData struct {
 	AccessLevel string
 
 	// Kubernetes-specific options
-	// Map of additional tools enabled (helm, cilium, inspektor-gadget)
+	// Map of additional tools enabled (helm, cilium)
 	AdditionalTools map[string]bool
 	// Comma-separated list of allowed Kubernetes namespaces
 	AllowNamespaces string
@@ -56,7 +56,7 @@ func (cfg *ConfigData) ParseFlags() {
 
 	// Kubernetes-specific settings
 	additionalTools := flag.String("additional-tools", "",
-		"Comma-separated list of additional Kubernetes tools to support (kubectl is always enabled). Available: helm,cilium,inspektor-gadget")
+		"Comma-separated list of additional Kubernetes tools to support (kubectl is always enabled). Available: helm,cilium")
 	flag.StringVar(&cfg.AllowNamespaces, "allow-namespaces", "",
 		"Comma-separated list of allowed Kubernetes namespaces (empty means all namespaces)")
 

internal/server/server.go

@@ -72,6 +72,9 @@ func (s *Service) Initialize() error {
 	// Register Kubernetes tools
 	s.registerKubernetesTools()
 
+	// Register Inspektor Gadget tools for observability
+	s.registerInspektorGadgetTools()
+
 	return nil
 }
 
@@ -234,12 +237,6 @@ func (s *Service) registerKubernetesTools() {
 		ciliumExecutor := k8s.WrapK8sExecutor(cilium.NewExecutor())
 		s.mcpServer.AddTool(ciliumTool, tools.CreateToolHandler(ciliumExecutor, s.cfg))
 	}
-
-	// Register Inspektor Gadget tools for observability
-	if s.cfg.AdditionalTools["inspektor-gadget"] {
-		log.Println("Registering Kubernetes tool: inspektor-gadget")
-		s.registerInspektorGadgetTools()
-	}
 }
 
 // registerKubectlCommands registers kubectl commands based on access level
@@ -271,6 +268,7 @@ func (s *Service) registerInspektorGadgetTools() {
 	}
 
 	// Register Inspektor Gadget tool
+	log.Println("Registering Inspektor Gadget Observability tool: inspektor_gadget_observability")
 	inspektorGadget := inspektorgadget.RegisterInspektorGadgetTool()
 	s.mcpServer.AddTool(inspektorGadget, tools.CreateResourceHandler(inspektorgadget.InspektorGadgetHandler(gadgetMgr, s.cfg), s.cfg))
 }