Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: prometheus/prometheus
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.11.1
Choose a base ref
...
head repository: prometheus/prometheus
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.11.2
Choose a head ref
  • 10 commits
  • 17 files changed
  • 4 contributors

Commits on Apr 9, 2026

  1. discovery/consul: add health_filter for Health API filtering

    The filter field was documented as targeting the Catalog API but since
    PR #17349 it was also passed to the Health API. This broke existing
    configs using Catalog-only fields like ServiceTags, which the Health API
    rejects (it uses Service.Tags instead).
    
    Introduce a separate health_filter field that is passed exclusively to
    the Health API, while filter remains catalog-only. Update the docs to
    explain the two-phase discovery (Catalog for service listing, Health for
    instances) and the field name differences between the two APIs.
    
    Fixes #18479
    
    Signed-off-by: Julien Pivotto <[email protected]>
    roidelapluie committed Apr 9, 2026
    Configuration menu
    Copy the full SHA
    1e73d2f View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2026

  1. discovery/consul: fix catalog watch trigger and improve filter tests

    When health_filter is set without explicit services, the catalog needs
    to be watched to enumerate services. Add watchedFilter to the condition
    that triggers catalog watching.
    
    Improve the filter test suite:
    - Replace defer with t.Cleanup for stub servers.
    - Rewrite TestFilterOption to assert that the catalog receives the filter
      and the health endpoint does not.
    - Rewrite TestHealthFilterOption to assert that health_filter is routed
      correctly to the health endpoint only.
    - Add TestBothFiltersOption to verify both filters are routed to their
      respective endpoints when both are configured.
    
    Signed-off-by: Julien Pivotto <[email protected]>
    roidelapluie committed Apr 10, 2026
    Configuration menu
    Copy the full SHA
    4cc5080 View commit details
    Browse the repository at this point in the history
  2. UI: Fix stored XSS via unescaped metric names and labels

    Metric names, label names, and label values containing HTML/JavaScript were
    inserted into `innerHTML` without escaping in several UI code paths, enabling
    stored XSS attacks via crafted metrics. This mostly becomes exploitable in
    Prometheus 3.x, since it defaults to allowing any UTF-8 characters in metric
    and label names.
    
    Apply `escapeHTML()` to all user-controlled values before innerHTML
    insertion in:
    
    * Mantine UI chart tooltip
    * Old React UI chart tooltip
    * Old React UI metrics explorer fuzzy search
    * Old React UI heatmap tooltip
    
    See GHSA-vffh-x6r8-xx99
    
    Signed-off-by: Julius Volz <[email protected]>
    juliusv authored and roidelapluie committed Apr 10, 2026
    Configuration menu
    Copy the full SHA
    fddbccf View commit details
    Browse the repository at this point in the history
  3. Merge pull request #18506 from roidelapluie/roidelapluie/backport-xss…

    …-issue
    
    UI: Fix stored XSS via unescaped metric names and labels
    roidelapluie authored Apr 10, 2026
    Configuration menu
    Copy the full SHA
    e95d2e3 View commit details
    Browse the repository at this point in the history
  4. Update docs/configuration/configuration.md

    Co-authored-by: George Krajcsovits <[email protected]>
    Signed-off-by: Julien <[email protected]>
    roidelapluie and krajorama authored Apr 10, 2026
    Configuration menu
    Copy the full SHA
    d09ea56 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #18499 from roidelapluie/roidelapluie/consul-healt…

    …h-filter-3.11
    
    discovery/consul: add health_filter for Health API filtering
    roidelapluie authored Apr 10, 2026
    Configuration menu
    Copy the full SHA
    fac097b View commit details
    Browse the repository at this point in the history
  6. config: add consul health_filter fixture coverage

    Signed-off-by: Mohammad Varmazyar <[email protected]>
    mrvarmazyar committed Apr 10, 2026
    Configuration menu
    Copy the full SHA
    06b7f1f View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2026

  1. Merge pull request #18510 from mrvarmazyar/fix/consul-health-filter-c…

    …onfig-fixtures
    
    config: add consul health_filter fixture coverage
    roidelapluie authored Apr 13, 2026
    Configuration menu
    Copy the full SHA
    931b2da View commit details
    Browse the repository at this point in the history
  2. Release 3.11.2

    Signed-off-by: Julien Pivotto <[email protected]>
    roidelapluie committed Apr 13, 2026
    Configuration menu
    Copy the full SHA
    f08b983 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f0f0fdd View commit details
    Browse the repository at this point in the history
Loading