Merge branch 'main' into feature/update-deprecated-prometheus-mem-cpu-queries

Author: tjmoyes

Dockerfile

@@ -1,5 +1,5 @@
-# Use the official Python 3.9 slim image as the base image
-FROM python:3.12-slim as builder
+# Use the official Python 3.12 slim image as the base image
+FROM python:3.12-slim AS builder
 ENV LANG=C.UTF-8
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
@@ -9,11 +9,6 @@ ENV PATH="/app/venv/bin:$PATH"
 RUN apt-get update && \
     dpkg --add-architecture arm64
 
-# We're installing here libexpat1, to upgrade the package to include a fix to 3 high CVEs. CVE-2024-45491,CVE-2024-45490,CVE-2024-45492
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends libexpat1 \
-    && rm -rf /var/lib/apt/lists/*
-
 # Set the working directory
 WORKDIR /app
 

README.md

@@ -19,8 +19,6 @@
     .
     <a href="#how-krr-works"><strong>How KRR works</strong></a>
     .
-    <a href="#slack-integration"><strong>Slack Integration</strong></a>
-    .
     <a href="#free-krr-ui-on-robusta-saas"><strong>Free KRR UI</strong></a>
     <br />
     <a href="#usage">Usage</a>
@@ -30,7 +28,9 @@
     <a href="https://github.com/robusta-dev/krr/issues">Request Feature</a>
     ·
     <a href="#support">Support</a>
-    <br /> Like KRR? Please ⭐ this repository to show your support!
+    <br />
+    <br />
+    <a href="https://trendshift.io/repositories/7087" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7087" alt="robusta-dev%2Fkrr | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
   </p>
 </div>
 <!-- TABLE OF CONTENTS -->
@@ -64,6 +64,10 @@
 
 Robusta KRR (Kubernetes Resource Recommender) is a CLI tool for **optimizing resource allocation** in Kubernetes clusters. It gathers pod usage data from Prometheus and **recommends requests and limits** for CPU and memory. This **reduces costs and improves performance**.
 
+### Auto-Apply Mode
+
+**New:** Put right-sizing on auto-pilot by applying recommendations automatically. [Request beta access](https://robusta-dev.typeform.com/krr-auto-apply).
+
 ### Data Integrations
 
 [![Used to send data to KRR](./images/krr-datasources.svg)](#data-source-integrations)
@@ -77,7 +81,7 @@ _View Instructions for: [Prometheus](#prometheus-victoria-metrics-and-thanos-aut
 
 [![Used to receive information from KRR](./images/krr-other-integrations.svg)](#integrations)
 
-_View instructions for: [Seeing recommendations in a UI](#free-ui-for-krr-recommendations), [Sending recommendations to Slack](#slack-notification), [Setting up KRR as a k9s plugin](#k9s-plugin)_
+_View instructions for: [Seeing recommendations in a UI](#free-ui-for-krr-recommendations), [Sending recommendations to Slack](#slack-notification), [Setting up KRR as a k9s plugin](#k9s-plugin), [Azure Blob Storage Export with Teams Notification](#azure-blob-teams-integration)_
 
 ### Features
 
@@ -348,6 +352,43 @@ python krr.py simple --selector 'app.kubernetes.io/instance in (robusta, ingress
 ```
 </details>
 
+<details>
+  <summary>Group jobs by specific labels</summary>
+
+Group jobs that have specific labels into GroupedJob objects for consolidated resource recommendations. This is useful for batch jobs, data processing pipelines, or any workload where you want to analyze resource usage across multiple related jobs.
+
+```sh
+krr simple --job-grouping-labels app,team
+```
+
+This will:
+- Group jobs that have either `app` or `team` labels (or both)
+- Create GroupedJob objects with names like `app=frontend`, `team=backend`, etc.
+- Provide resource recommendations for the entire group instead of individual jobs
+- Jobs with the specified labels will be excluded from regular Job listing
+
+You can specify multiple labels separated by commas:
+
+```sh
+krr simple --job-grouping-labels app,team,environment
+```
+
+Each job will be grouped by each label it has, so a job with `app=api,team=backend` will appear in both `app=api` and `team=backend` groups.
+
+### Limiting how many jobs are included per group
+
+Use `--job-grouping-limit <N>` to cap how many jobs are included **per group** (useful when there are many historical jobs).
+
+```sh
+krr simple --job-grouping-labels app,team --job-grouping-limit 3
+```
+
+* Each label group will include at most **N** jobs (e.g., the first 3 returned by the API).
+* Other matching jobs beyond the limit are ignored for that group.
+* If not specified, the default limit is **500** jobs per group.
+
+</details>
+
 <details>
   <summary>Override the kubectl context</summary>
 
@@ -369,6 +410,7 @@ Currently KRR ships with a few formatters to represent the scan data:
 - `yaml`
 - `pprint` - data representation from python's pprint library
 - `csv` - export data to a csv file in the current directory
+- `csv-raw` - csv with raw data for calculation
 - `html`
 
 To run a strategy with a selected formatter, add a `-f` flag. Usually this should be combined with `--fileoutput <filename>` to write clean output to file without logs:
@@ -677,6 +719,84 @@ customPlaybooks:
   Installation instructions: [k9s docs](https://k9scli.io/topics/plugins/)
 </details>
 
+<details id="azure-blob-teams-integration">
+<summary>Azure Blob Storage Export with Microsoft Teams Notifications</summary>
+
+Export KRR reports directly to Azure Blob Storage and get notified in Microsoft Teams when reports are generated.
+
+![Teams Notification Screenshot][teams-screenshot]
+
+### Prerequisites
+
+- An Azure Storage Account with a container for storing reports
+- A Microsoft Teams channel with an incoming webhook configured
+- Azure SAS URL with write permissions to your storage container
+
+### Setup
+
+1. **Create Azure Storage Container**: Set up a container in your Azure Storage Account (e.g., `fileuploads`)
+
+2. **Generate SAS URL**: Create a SAS URL for your container with write permissions:
+   ```bash
+   # Example SAS URL format (replace with your actual values)
+   https://yourstorageaccount.blob.core.windows.net/fileuploads?sv=2024-11-04&ss=bf&srt=o&sp=wactfx&se=2026-07-21T21:12:48Z&st=2025-07-21T12:57:48Z&spr=https&sig=...
+   ```
+
+3. **Configure Teams Webhook**: Set up an incoming webhook in your Microsoft Teams channel (located in the Workflows tab)
+
+4. **Run KRR with Azure Integration**:
+   ```bash
+   krr simple -f html \
+     --azurebloboutput "https://yourstorageaccount.blob.core.windows.net/fileuploads?sv=..." \
+     --teams-webhook "https://your-teams-webhook-url" \
+     --azure-subscription-id "your-subscription-id" \
+     --azure-resource-group "your-resource-group"
+   ```
+
+### Features
+
+- **Automatic File Upload**: Reports are automatically uploaded to Azure Blob Storage with timestamped filenames
+- **Teams Notifications**: Rich adaptive cards are sent to Teams when reports are generated
+- **Direct Links**: Teams notifications include direct links to view files in Azure Portal
+- **Multiple Formats**: Supports all KRR output formats (JSON, CSV, HTML, YAML, etc.)
+- **Secure**: Uses SAS URLs for secure, time-limited access to your storage
+
+### Command Options
+
+| Flag | Description |
+|------|-------------|
+| `--azurebloboutput` | Azure Blob Storage SAS URL base path (make sure you include the container name; filename will be auto-appended) |
+| `--teams-webhook` | Microsoft Teams webhook URL for notifications |
+| `--azure-subscription-id` | Azure Subscription ID (for Azure Portal links in Teams) |
+| `--azure-resource-group` | Azure Resource Group name (for Azure Portal links in Teams) |
+
+### Example Usage
+
+```bash
+# Basic Azure Blob export
+krr simple -f json --azurebloboutput "https://mystorageaccount.blob.core.windows.net/reports?sv=..."
+
+# With Teams notifications
+krr simple -f html \
+  --azurebloboutput "https://mystorageaccount.blob.core.windows.net/reports?sv=..." \
+  --teams-webhook "https://outlook.office.com/webhook/..." \
+  --azure-subscription-id "12345678-1234-1234-1234-123456789012" \
+  --azure-resource-group "my-resource-group"
+```
+
+### Teams Notification Features
+
+The Teams adaptive card includes:
+- 📊 Report generation announcement
+- Namespace and format details  
+- Generation timestamp
+- Storage account and container information
+- Direct "View in Azure Storage" button linking to Azure Portal
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
+
+</details>
+
 ## Creating a Custom Strategy/Formatter
 
 Look into the [examples](https://github.com/robusta-dev/krr/tree/main/examples) directory for examples on how to create a custom strategy/formatter.
@@ -763,3 +883,4 @@ If you have any questions, feel free to contact **support@robusta.dev** or messa
 [product-screenshot]: images/screenshot.jpeg
 [slack-screenshot]: images/krr_slack_example.png
 [ui-screenshot]: images/ui_video.gif
+[teams-screenshot]: images/krr_teams_example.png

conftest.py

@@ -0,0 +1,2 @@
+# Make sure pytest loads the asyncio plugin so `async def` tests run.
+pytest_plugins = ("pytest_asyncio",)

enforcer/Dockerfile

@@ -0,0 +1,25 @@
+FROM python:3.12-alpine
+ENV LANG=C.UTF-8
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+ENV PATH="/app/venv/bin:$PATH"
+
+# Patching CVE-2025-6965
+RUN apk update && apk add --no-cache --upgrade \
+    sqlite-libs=3.49.2-r1 sqlite=3.49.2-r1
+    
+# Set the working directory
+WORKDIR /app/enforcer
+
+COPY ./*.py .
+COPY ./dal/ dal/
+COPY ./resources/ resources/
+COPY ./requirements.txt requirements.txt
+
+
+RUN pip install --no-cache-dir --upgrade pip
+# Install the project dependencies
+RUN python -m ensurepip --upgrade
+RUN pip install --no-cache-dir -r requirements.txt
+
+CMD ["python", "enforcer_main.py"]