Verify

.env.example

@@ -371,6 +371,30 @@ MCPGATEWAY_A2A_MAX_RETRIES=3
 # Enable A2A agent metrics collection (true/false)
 MCPGATEWAY_A2A_METRICS_ENABLED=true
 
+#####################################
+# MCP Server Catalog Configuration
+#####################################
+
+# Enable MCP server catalog feature (NEW in v0.7.0)
+# Allows defining a catalog of pre-configured MCP servers in a YAML file
+# for easy discovery and management via the Admin UI
+# Options: true (default), false
+MCPGATEWAY_CATALOG_ENABLED=true
+
+# Path to the catalog configuration file
+# YAML file containing MCP server definitions
+# Default: mcp-catalog.yml
+MCPGATEWAY_CATALOG_FILE=mcp-catalog.yml
+
+# Automatically health check catalog servers on startup and periodically
+# Options: true (default), false
+MCPGATEWAY_CATALOG_AUTO_HEALTH_CHECK=true
+
+# Catalog cache TTL in seconds
+# How long to cache catalog data before refreshing
+# Default: 3600 (1 hour)
+MCPGATEWAY_CATALOG_CACHE_TTL=3600
+
 #####################################
 # Header Passthrough Configuration
 #####################################
@@ -562,7 +586,8 @@ FEDERATION_DISCOVERY=false
 FEDERATION_PEERS=[]
 
 # Timeout for federation requests in seconds
-FEDERATION_TIMEOUT=30
+# Default: 120 seconds (matches config.py)
+FEDERATION_TIMEOUT=120
 
 # Interval between federation sync operations in seconds
 FEDERATION_SYNC_INTERVAL=300
@@ -593,9 +618,11 @@ PROMPT_RENDER_TIMEOUT=10
 
 # Health Check Configuration
 HEALTH_CHECK_INTERVAL=60
-HEALTH_CHECK_TIMEOUT=15
+# Health check timeout in seconds (default: 10, matches config.py)
+HEALTH_CHECK_TIMEOUT=10
 UNHEALTHY_THRESHOLD=5
-GATEWAY_VALIDATION_TIMEOUT=10
+# Gateway URL validation timeout in seconds (default: 5, matches config.py)
+GATEWAY_VALIDATION_TIMEOUT=5
 
 # File lock name for gateway service leader election
 # Used to coordinate multiple gateway instances when running in cluster mode

README.md

@@ -1296,6 +1296,20 @@ ContextForge implements **OAuth 2.0 Dynamic Client Registration (RFC 7591)** and
 | `INVITATION_EXPIRY_DAYS`                 | Number of days before team invitations expire   | `7`        | int > 0 |
 | `REQUIRE_EMAIL_VERIFICATION_FOR_INVITES` | Require email verification for team invitations | `true`     | bool    |
 
+### MCP Server Catalog
+
+> 🆕 **New in v0.7.0**: The MCP Server Catalog allows you to define a catalog of pre-configured MCP servers in a YAML file for easy discovery and management via the Admin UI.
+
+| Setting                              | Description                                      | Default            | Options |
+| ------------------------------------ | ------------------------------------------------ | ------------------ | ------- |
+| `MCPGATEWAY_CATALOG_ENABLED`        | Enable MCP server catalog feature                | `true`             | bool    |
+| `MCPGATEWAY_CATALOG_FILE`           | Path to catalog configuration file               | `mcp-catalog.yml`  | string  |
+| `MCPGATEWAY_CATALOG_AUTO_HEALTH_CHECK` | Automatically health check catalog servers    | `true`             | bool    |
+| `MCPGATEWAY_CATALOG_CACHE_TTL`      | Catalog cache TTL in seconds                     | `3600`             | int > 0 |
+
+**Documentation:**
+- [MCP Server Catalog Guide](https://ibm.github.io/mcp-context-forge/manage/catalog/) - Complete catalog setup and configuration
+
 ### Security
 
 | Setting                   | Description                    | Default                                        | Options    |

docs/docs/architecture/adr/.pages

@@ -1,5 +1,6 @@
 title: Decision Records
 nav:
+  - Overview: index.md
   - 1 Adopt FastAPI + Pydantic: 001-adopt-fastapi-pydantic.md
   - 2 Use Async SQLAlchemy ORM: 002-use-async-sqlalchemy-orm.md
   - 3 Expose Multi-Transport Endpoints: 003-expose-multi-transport-endpoints.md
@@ -8,7 +9,7 @@ nav:
   - 6 Gateway & Tool-Level Rate Limiting: 006-gateway-tool-rate-limiting.md
   - 7 Pluggable Cache Backend: 007-pluggable-cache-backend.md
   - 8 Federation & Auto-Discovery via DNS-SD: 008-federation-discovery.md
-  - 9 Built-in Health Checks: 000-built-in-health-checks.md
+  - 9 Built-in Health Checks: 009-built-in-health-checks.md
   - 10 Observability via Prometheus: 010-observability-prometheus.md
   - 11 Namespaced Tool Federation: 011-tool-federation.md
   - 12 Drop-down tool selection: 012-dropdown-ui-tool-selection.md

docs/docs/manage/.pages

@@ -4,6 +4,7 @@ nav:
   - scale.md
   - tuning.md
   - backup.md
+  - catalog.md
   - bulk-import.md
   - metadata-tracking.md
   - export-import.md