awslabs.prometheus-mcp-server 0.1.1__tar.gz → 0.2.2__tar.gz

{awslabs_prometheus_mcp_server-0.1.1 → awslabs_prometheus_mcp_server-0.2.2}/.gitignore

@@ -244,6 +244,10 @@ pyrightconfig.json
 .history
 .ionide
 
+### Kiro
+# Ignore Kiro config files
+.kiro/
+
 ### Windows ###
 # Windows thumbnail cache files
 Thumbs.db
@@ -563,3 +567,10 @@ samples/mcp-integration-with-nova-canvas/output/*
 
 memory-bank/*
 .clinerules
+
+# OpenAPI MCP Server specific ignores
+src/openapi-mcp-server/generated-diagrams/*
+src/openapi-mcp-server/*.txt
+src/openapi-mcp-server/*-coverage.xml
+src/openapi-mcp-server/junit.xml
+executive-summary.md

awslabs_prometheus_mcp_server-0.2.2/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.2.0] - 2024-06-01
+
+### Changed
+
+- Refactored to use workspace-based configuration model
+- Added GetAvailableWorkspaces tool to list available Prometheus workspaces
+- Modified all tools to require workspace_id parameter
+- Removed requirement for Prometheus URL at startup
+- Added per-request workspace configuration
+
+## [0.1.1] - 2024-05-15
+
+### Added
+
+- Initial project setup

{awslabs_prometheus_mcp_server-0.1.1 → awslabs_prometheus_mcp_server-0.2.2}/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # dependabot should continue to update this to the latest hash.
-FROM public.ecr.aws/sam/build-python3.10@sha256:a40f492a0cd8d76557f8a187fc00e49e8864b3cea683e74718ce317790c1ce61 AS uv
+FROM public.ecr.aws/docker/library/python:3.13.5-alpine3.21@sha256:c9a09c45a4bcc618c7f7128585b8dd0d41d0c31a8a107db4c8255ffe0b69375d AS uv
 
 # Install the project into `/app`
 WORKDIR /app
@@ -31,40 +31,50 @@ ENV UV_PYTHON_PREFERENCE=only-system
 ENV UV_FROZEN=true
 
 # Copy the required files first
-COPY pyproject.toml uv.lock ./
+COPY pyproject.toml uv.lock uv-requirements.txt ./
+
+# Python optimization and uv configuration
+ENV PIP_NO_CACHE_DIR=1 \
+    PIP_DISABLE_PIP_VERSION_CHECK=1
+
+# Install system dependencies and Python package manager
+RUN apk update && \
+    apk add --no-cache --virtual .build-deps \
+    build-base \
+    gcc \
+    musl-dev \
+    libffi-dev \
+    openssl-dev \
+    cargo
 
 # Install the project's dependencies using the lockfile and settings
 RUN --mount=type=cache,target=/root/.cache/uv \
-    pip install uv && \
-    uv sync --frozen --no-install-project --no-dev --no-editable
+    pip install --require-hashes --requirement uv-requirements.txt --no-cache-dir && \
+    uv sync --python 3.13 --frozen --no-install-project --no-dev --no-editable
 
 # Then, add the rest of the project source code and install it
 # Installing separately from its dependencies allows optimal layer caching
 COPY . /app
 RUN --mount=type=cache,target=/root/.cache/uv \
-    uv sync --frozen --no-dev --no-editable
+    uv sync --python 3.13 --frozen --no-dev --no-editable
 
 # Make the directory just in case it doesn't exist
 RUN mkdir -p /root/.local
 
-FROM public.ecr.aws/sam/build-python3.10@sha256:a40f492a0cd8d76557f8a187fc00e49e8864b3cea683e74718ce317790c1ce61
+FROM public.ecr.aws/docker/library/python:3.13.5-alpine3.21@sha256:c9a09c45a4bcc618c7f7128585b8dd0d41d0c31a8a107db4c8255ffe0b69375d
 
 # Place executables in the environment at the front of the path and include other binaries
-ENV PATH="/app/.venv/bin:$PATH:/usr/sbin"
-
-# Install lsof for the healthcheck
-# Install other tools as needed for the MCP server
-# Add non-root user and ability to change directory into /root
-RUN yum update -y && \
-    yum install -y lsof && \
-    yum clean all -y && \
-    rm -rf /var/cache/yum && \
-    groupadd --force --system app && \
-    useradd app -g app -d /app && \
-    chmod o+x /root
-
-# Get the project from the uv layer
-COPY --from=uv --chown=app:app /root/.local /root/.local
+ENV PATH="/app/.venv/bin:$PATH" \
+    PYTHONUNBUFFERED=1
+
+# Install runtime dependencies and create application user
+RUN apk update && \
+    apk add --no-cache ca-certificates && \
+    update-ca-certificates && \
+    addgroup -S app && \
+    adduser -S app -G app -h /app
+
+# Copy application artifacts from build stage
 COPY --from=uv --chown=app:app /app/.venv /app/.venv
 
 # Get healthcheck script
@@ -74,5 +84,5 @@ COPY ./docker-healthcheck.sh /usr/local/bin/docker-healthcheck.sh
 USER app
 
 # When running the container, add --db-path and a bind mount to the host's db file
-HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD [ "docker-healthcheck.sh" ]
+HEALTHCHECK --interval=60s --timeout=10s --start-period=10s --retries=3 CMD ["docker-healthcheck.sh"]
 ENTRYPOINT ["awslabs.prometheus-mcp-server"]

{awslabs_prometheus_mcp_server-0.1.1 → awslabs_prometheus_mcp_server-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.prometheus-mcp-server
-Version: 0.1.1
+Version: 0.2.2
 Summary: MCP server for interacting with AWS Managed Prometheus
 Project-URL: homepage, https://awslabs.github.io/mcp/
 Project-URL: docs, https://awslabs.github.io/mcp/servers/prometheus-mcp-server/
@@ -24,7 +24,7 @@ Requires-Python: >=3.10
 Requires-Dist: boto3>=1.38.7
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: loguru>=0.7.0
-Requires-Dist: mcp[cli]>=1.7.0
+Requires-Dist: mcp[cli]>=1.11.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: requests>=2.32.3
@@ -47,6 +47,10 @@ This MCP server is designed to be fully compatible with Amazon Q developer CLI,
 
 ## Installation
 
+| Cursor | VS Code |
+|:------:|:-------:|
+| [![Install MCP Server](https://cursor.com/deeplink/mcp-install-light.svg)](https://cursor.com/install-mcp?name=awslabs.prometheus-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMucHJvbWV0aGV1cy1tY3Atc2VydmVyQGxhdGVzdCAtLXVybCBodHRwczovL2Fwcy13b3Jrc3BhY2VzLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tL3dvcmtzcGFjZXMvd3MtPFdvcmtzcGFjZSBJRD4gLS1yZWdpb24gPFlvdXIgQVdTIFJlZ2lvbj4gLS1wcm9maWxlIDxZb3VyIENMSSBQcm9maWxlIFtkZWZhdWx0XSBpZiBubyBwcm9maWxlIGlzIHVzZWQ%2BIiwiZW52Ijp7IkZBU1RNQ1BfTE9HX0xFVkVMIjoiREVCVUciLCJBV1NfUFJPRklMRSI6IjxZb3VyIENMSSBQcm9maWxlIFtkZWZhdWx0XSBpZiBubyBwcm9maWxlIGlzIHVzZWQ%2BIn19) | [![Install on VS Code](https://img.shields.io/badge/Install_on-VS_Code-FF9900?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=Prometheus%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.prometheus-mcp-server%40latest%22%2C%22--url%22%2C%22https%3A%2F%2Faps-workspaces.us-east-1.amazonaws.com%2Fworkspaces%2Fws-%3CWorkspace%20ID%3E%22%2C%22--region%22%2C%22%3CYour%20AWS%20Region%3E%22%2C%22--profile%22%2C%22%3CYour%20CLI%20Profile%20%5Bdefault%5D%20if%20no%20profile%20is%20used%3E%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22DEBUG%22%2C%22AWS_PROFILE%22%3A%22%3CYour%20CLI%20Profile%20%5Bdefault%5D%20if%20no%20profile%20is%20used%3E%22%7D%7D) |
+
 ### Prerequisites
 
 - Python 3.10 or higher
@@ -69,23 +73,41 @@ mkdir -p ~/.aws/amazonq/
 ```
 
 2. Add the following to `~/.aws/amazonq/mcp.json`:
+
+### Basic Configuration
+```json
+{
+  "mcpServers": {
+    "prometheus": {
+      "command": "uvx",
+      "args": [
+        "awslabs.prometheus-mcp-server@latest"
+      ],
+      "env": {
+        "FASTMCP_LOG_LEVEL": "DEBUG"
+      }
+    }
+  }
+}
+```
+
+### Configuration with Optional Arguments
 ```json
 {
   "mcpServers": {
-    "awslabs.prometheus-mcp-server": {
+    "prometheus": {
       "command": "uvx",
       "args": [
         "awslabs.prometheus-mcp-server@latest",
         "--url",
-        "https://aps-workspaces.us-east-1.amazonaws.com/workspaces/ws-<Workspace ID>",
+        "https://aps-workspaces.<AWS Region>.amazonaws.com/workspaces/ws-<Workspace ID>",
         "--region",
         "<Your AWS Region>",
         "--profile",
-        "<Your CLI Profile [default] if no profile is used>"
+        "<Your CLI Profile>"
       ],
       "env": {
-        "FASTMCP_LOG_LEVEL": "DEBUG",
-        "AWS_PROFILE": "<Your CLI Profile [default] if no profile is used>"
+        "FASTMCP_LOG_LEVEL": "DEBUG"
       }
     }
   }
@@ -96,30 +118,46 @@ mkdir -p ~/.aws/amazonq/
 
 ## Available Tools
 
-1. **execute_query**
+1. **GetAvailableWorkspaces**
+   - List all available Prometheus workspaces in the specified region
+   - Parameters: region (optional)
+   - Returns: List of workspaces with IDs, aliases, and status
+
+2. **ExecuteQuery**
    - Execute instant PromQL queries against Prometheus
-   - Parameters: query (required), time (optional)
+   - Parameters: workspace_id (required), query (required), time (optional), region (optional)
 
-2. **execute_range_query**
+3. **ExecuteRangeQuery**
    - Execute PromQL queries over a time range
-   - Parameters: query, start time, end time, step interval
+   - Parameters: workspace_id (required), query, start time, end time, step interval, region (optional)
 
-3. **list_metrics**
+4. **ListMetrics**
    - Retrieve all available metric names from Prometheus
+   - Parameters: workspace_id (required), region (optional)
    - Returns: Sorted list of metric names
 
-4. **get_server_info**
+5. **GetServerInfo**
    - Retrieve server configuration details
+   - Parameters: workspace_id (required), region (optional)
    - Returns: URL, region, profile, and service information
 
 ## Example Queries
 
 ```python
+# Get available workspaces
+workspaces = await get_available_workspaces()
+for ws in workspaces['workspaces']:
+    print(f"ID: {ws['workspace_id']}, Alias: {ws['alias']}, Status: {ws['status']}")
+
 # Execute an instant query
-result = await execute_query("up")
+result = await execute_query(
+    workspace_id="ws-12345678-abcd-1234-efgh-123456789012",
+    query="up"
+)
 
 # Execute a range query
 data = await execute_range_query(
+    workspace_id="ws-12345678-abcd-1234-efgh-123456789012",
     query="rate(node_cpu_seconds_total[5m])",
     start="2023-01-01T00:00:00Z",
     end="2023-01-01T01:00:00Z",
@@ -127,10 +165,14 @@ data = await execute_range_query(
 )
 
 # List available metrics
-metrics = await list_metrics()
+metrics = await list_metrics(
+    workspace_id="ws-12345678-abcd-1234-efgh-123456789012"
+)
 
 # Get server information
-info = await get_server_info()
+info = await get_server_info(
+    workspace_id="ws-12345678-abcd-1234-efgh-123456789012"
+)
 ```
 
 ## Troubleshooting

{awslabs_prometheus_mcp_server-0.1.1 → awslabs_prometheus_mcp_server-0.2.2}/README.md

@@ -15,6 +15,10 @@ This MCP server is designed to be fully compatible with Amazon Q developer CLI,
 
 ## Installation
 
+| Cursor | VS Code |
+|:------:|:-------:|
+| [![Install MCP Server](https://cursor.com/deeplink/mcp-install-light.svg)](https://cursor.com/install-mcp?name=awslabs.prometheus-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMucHJvbWV0aGV1cy1tY3Atc2VydmVyQGxhdGVzdCAtLXVybCBodHRwczovL2Fwcy13b3Jrc3BhY2VzLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tL3dvcmtzcGFjZXMvd3MtPFdvcmtzcGFjZSBJRD4gLS1yZWdpb24gPFlvdXIgQVdTIFJlZ2lvbj4gLS1wcm9maWxlIDxZb3VyIENMSSBQcm9maWxlIFtkZWZhdWx0XSBpZiBubyBwcm9maWxlIGlzIHVzZWQ%2BIiwiZW52Ijp7IkZBU1RNQ1BfTE9HX0xFVkVMIjoiREVCVUciLCJBV1NfUFJPRklMRSI6IjxZb3VyIENMSSBQcm9maWxlIFtkZWZhdWx0XSBpZiBubyBwcm9maWxlIGlzIHVzZWQ%2BIn19) | [![Install on VS Code](https://img.shields.io/badge/Install_on-VS_Code-FF9900?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=Prometheus%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.prometheus-mcp-server%40latest%22%2C%22--url%22%2C%22https%3A%2F%2Faps-workspaces.us-east-1.amazonaws.com%2Fworkspaces%2Fws-%3CWorkspace%20ID%3E%22%2C%22--region%22%2C%22%3CYour%20AWS%20Region%3E%22%2C%22--profile%22%2C%22%3CYour%20CLI%20Profile%20%5Bdefault%5D%20if%20no%20profile%20is%20used%3E%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22DEBUG%22%2C%22AWS_PROFILE%22%3A%22%3CYour%20CLI%20Profile%20%5Bdefault%5D%20if%20no%20profile%20is%20used%3E%22%7D%7D) |
+
 ### Prerequisites
 
 - Python 3.10 or higher
@@ -37,23 +41,41 @@ mkdir -p ~/.aws/amazonq/
 ```
 
 2. Add the following to `~/.aws/amazonq/mcp.json`:
+
+### Basic Configuration
+```json
+{
+  "mcpServers": {
+    "prometheus": {
+      "command": "uvx",
+      "args": [
+        "awslabs.prometheus-mcp-server@latest"
+      ],
+      "env": {
+        "FASTMCP_LOG_LEVEL": "DEBUG"
+      }
+    }
+  }
+}
+```
+
+### Configuration with Optional Arguments
 ```json
 {
   "mcpServers": {
-    "awslabs.prometheus-mcp-server": {
+    "prometheus": {
       "command": "uvx",
       "args": [
         "awslabs.prometheus-mcp-server@latest",
         "--url",
-        "https://aps-workspaces.us-east-1.amazonaws.com/workspaces/ws-<Workspace ID>",
+        "https://aps-workspaces.<AWS Region>.amazonaws.com/workspaces/ws-<Workspace ID>",
         "--region",
         "<Your AWS Region>",
         "--profile",
-        "<Your CLI Profile [default] if no profile is used>"
+        "<Your CLI Profile>"
       ],
       "env": {
-        "FASTMCP_LOG_LEVEL": "DEBUG",
-        "AWS_PROFILE": "<Your CLI Profile [default] if no profile is used>"
+        "FASTMCP_LOG_LEVEL": "DEBUG"
       }
     }
   }
@@ -64,30 +86,46 @@ mkdir -p ~/.aws/amazonq/
 
 ## Available Tools
 
-1. **execute_query**
+1. **GetAvailableWorkspaces**
+   - List all available Prometheus workspaces in the specified region
+   - Parameters: region (optional)
+   - Returns: List of workspaces with IDs, aliases, and status
+
+2. **ExecuteQuery**
    - Execute instant PromQL queries against Prometheus
-   - Parameters: query (required), time (optional)
+   - Parameters: workspace_id (required), query (required), time (optional), region (optional)
 
-2. **execute_range_query**
+3. **ExecuteRangeQuery**
    - Execute PromQL queries over a time range
-   - Parameters: query, start time, end time, step interval
+   - Parameters: workspace_id (required), query, start time, end time, step interval, region (optional)
 
-3. **list_metrics**
+4. **ListMetrics**
    - Retrieve all available metric names from Prometheus
+   - Parameters: workspace_id (required), region (optional)
    - Returns: Sorted list of metric names
 
-4. **get_server_info**
+5. **GetServerInfo**
    - Retrieve server configuration details
+   - Parameters: workspace_id (required), region (optional)
    - Returns: URL, region, profile, and service information
 
 ## Example Queries
 
 ```python
+# Get available workspaces
+workspaces = await get_available_workspaces()
+for ws in workspaces['workspaces']:
+    print(f"ID: {ws['workspace_id']}, Alias: {ws['alias']}, Status: {ws['status']}")
+
 # Execute an instant query
-result = await execute_query("up")
+result = await execute_query(
+    workspace_id="ws-12345678-abcd-1234-efgh-123456789012",
+    query="up"
+)
 
 # Execute a range query
 data = await execute_range_query(
+    workspace_id="ws-12345678-abcd-1234-efgh-123456789012",
     query="rate(node_cpu_seconds_total[5m])",
     start="2023-01-01T00:00:00Z",
     end="2023-01-01T01:00:00Z",
@@ -95,10 +133,14 @@ data = await execute_range_query(
 )
 
 # List available metrics
-metrics = await list_metrics()
+metrics = await list_metrics(
+    workspace_id="ws-12345678-abcd-1234-efgh-123456789012"
+)
 
 # Get server information
-info = await get_server_info()
+info = await get_server_info(
+    workspace_id="ws-12345678-abcd-1234-efgh-123456789012"
+)
 ```
 
 ## Troubleshooting

{awslabs_prometheus_mcp_server-0.1.1 → awslabs_prometheus_mcp_server-0.2.2}/awslabs/prometheus_mcp_server/__init__.py

@@ -14,4 +14,4 @@
 
 """awslabs Prometheus MCP Server."""
 
-__version__ = '0.1.0'
+__version__ = '0.2.0'

awslabs_prometheus_mcp_server-0.2.2/awslabs/prometheus_mcp_server/models.py

@@ -0,0 +1,50 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Data models for the Prometheus MCP server."""
+
+from pydantic import BaseModel, Field
+from typing import List, Optional
+
+
+class MetricsList(BaseModel):
+    """List of available metrics in Prometheus.
+
+    Attributes:
+        metrics: List of metric names available in the Prometheus server.
+    """
+
+    metrics: List[str] = Field(
+        description='List of metric names available in the Prometheus server'
+    )
+
+
+class ServerInfo(BaseModel):
+    """Information about the Prometheus server configuration.
+
+    Attributes:
+        prometheus_url: URL of the AWS Managed Prometheus endpoint.
+        aws_region: AWS region where the Prometheus service is located.
+        aws_profile: AWS profile name used for authentication.
+        service_name: AWS service name for SigV4 authentication.
+    """
+
+    prometheus_url: Optional[str] = Field(
+        None, description='URL of the AWS Managed Prometheus endpoint'
+    )
+    aws_region: str = Field(description='AWS region where the Prometheus service is located')
+    aws_profile: Optional[str] = Field(
+        None, description='AWS profile name used for authentication'
+    )
+    service_name: str = Field(description='AWS service name for SigV4 authentication')