Add optional docker-compose service for mcp-grafana; update Make targets

Author: sd2k

Makefile

@@ -6,7 +6,7 @@ help: ## Print this help message.
 	@echo ""
 	@echo "Targets:"
 	@echo ""
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@grep -E '^[a-zA-Z_0-9-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: build-image
 build-image: ## Build the Docker image.
@@ -28,7 +28,7 @@ test-unit: ## Run the unit tests (no external dependencies required).
 test: test-unit
 
 .PHONY: test-integration
-test-integration: ## Run only the Docker-based integration tests (Requires docker containers to be up and running).
+test-integration: ## Run only the Docker-based integration tests (requires docker-compose services to be running, use `make run-test-services` to start them).
 	go test -v -tags integration ./...
 
 .PHONY: test-cloud
@@ -43,10 +43,15 @@ run: ## Run the MCP server in stdio mode.
 run-sse: ## Run the MCP server in SSE mode.
 	go run ./cmd/mcp-grafana --transport sse
 
+.PHONY: run-e2e-test-services
+run-e2e-test-services: ## Run the docker-compose services required for the Python E2E tests.
+	COMPOSE_PROFILES=mcp docker-compose up -d --build
+
+.PHONY: run-test-services
+run-test-services: ## Run the docker-compose services required for the unit and integration tests
+	docker-compose up -d --build
+
 .PHONY: test-python-e2e
-test-python-e2e: ## Run Python E2E tests (requires Docker, MCP server, and Python deps)
-	docker-compose up -d
-	nohup go run ./cmd/mcp-grafana -t sse > mcp.log 2>&1 &
-	sleep 30
+test-python-e2e: ## Run Python E2E tests (requires docker-compose services to be running, use `make run-e2e-test-services` to start them).
 	cd tests && uv sync --all-groups
 	cd tests && uv run pytest

docker-compose.yaml

@@ -36,3 +36,23 @@ services:
     command: -config.file=/etc/promtail/config.yml
     depends_on:
       - loki
+
+  mcp-grafana:
+    profiles:
+      - mcp
+    build:
+      context: .
+    command:
+      - /app/mcp-grafana
+      - --transport
+      - sse
+      - --sse-address
+      - 0.0.0.0:8000
+      - --debug
+      - --log-level
+      - debug
+    environment:
+      MCP_PROMETHEUS_URL: http://prometheus:9090
+      GRAFANA_URL: http://grafana:3000
+    ports:
+      - 8000:8000