Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream prometheus/prometheus at c10186e #623

Merged
merged 18 commits into from
May 3, 2024

Commits on Apr 24, 2024

  1. Merge pull request #13986 from prometheus/main

    promtool: Fix panic on extended tsdb analyze (#13976)
    ArthurSens committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    2950521 View commit details
    Browse the repository at this point in the history
  2. Prepare v2.52 release

    Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
    Arthur Silva Sens committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    9195d51 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. tests: API: simplify check of error response

    Since we already use require.JSONEq in similar cases.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    2c4a363 View commit details
    Browse the repository at this point in the history
  2. tests: API: Use jsoniter when encoding

    So that tests use the same encoding as the api.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    5a339ba View commit details
    Browse the repository at this point in the history
  3. tests: API: Let nil expected response mean skip check

    When we want to check just the json encoding.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    c8aed6b View commit details
    Browse the repository at this point in the history
  4. refactor: API: be explicit that we marshal empty objects

    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    66a1c3d View commit details
    Browse the repository at this point in the history
  5. refactor: API: separate typed and unsafe marshalling

    The typed versions are used when we call from one marshaller to another.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e0a00f4 View commit details
    Browse the repository at this point in the history
  6. test: API: check empty responses

    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    00247b5 View commit details
    Browse the repository at this point in the history
  7. bugfix: API: encode empty Vector/Matrix as []

    If the underlying data is `nil` the default encoding
    will render `"null"` which is not accepted by
    (some) Prometheus client libraries.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    5c8ffaa View commit details
    Browse the repository at this point in the history
  8. Merge pull request #13997 from bboreham/api-marshalling

    bugfix: API: encode empty Vector/Matrix as [] not null
    ArthurSens committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    3d42466 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Merge pull request #13969 from prometheus/prepare-v2.52

    Prepare v2.52.0-rc.0 release
    ArthurSens committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    f170a01 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Update promu

    Update promu to the latest release.
    
    Signed-off-by: SuperQ <superq@gmail.com>
    SuperQ committed May 1, 2024
    Configuration menu
    Copy the full SHA
    f09cf2d View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Configuration menu
    Copy the full SHA
    650f4d7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #14023 from prometheus/superq/promu

    Update promu
    SuperQ committed May 2, 2024
    Configuration menu
    Copy the full SHA
    73f42fe View commit details
    Browse the repository at this point in the history
  3. Merge pull request #14039 from prometheus/resolve-conflicts-2.52

    Merge `release-2.52` back to main
    Nexucis committed May 2, 2024
    Configuration menu
    Copy the full SHA
    94c81bb View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. removed formateoverview section (#13994)

    docs: Remove outdated information about remote-read API
    
    ---------
    
    Signed-off-by: kushagra Shukla <kushalshukla110@gmail.com>
    Signed-off-by: Kushal shukla <85934954+kushalShukla-web@users.noreply.github.com>
    Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
    Co-authored-by: Arthur Silva Sens <arthur.sens@coralogix.com>
    kushalShukla-web and Arthur Silva Sens committed May 3, 2024
    Configuration menu
    Copy the full SHA
    d2caf51 View commit details
    Browse the repository at this point in the history
  2. BUGFIX: Mark the rule's restoration process as completed always (#14048)

    * BUGFIX: Mark the rule's restoration process as completed always
    
    In prometheus/prometheus#13980 I introduced a change to reduce the number of queries executed when we restore alert statuses.
    
    With this, the querying semantics changed as we now need to go through all series before we enter the alert restoration loop and I missed the fact that exiting early when there are no rules to restore would lead to an incomplete restoration.
    
    An alert being restored is used as a proxy for "we're now ready to write `ALERTS/ALERTS_FOR_SERIES` metrics" so as a result we weren't writing the series if we didn't restore anything the first time around.
    ---------
    
    Signed-off-by: gotjosh <josue.abreu@gmail.com>
    gotjosh committed May 3, 2024
    Configuration menu
    Copy the full SHA
    c10186e View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'upstream/main' into gotjosh/update-mimi…

    …r-prometheus-c10186e
    
    * upstream/main:
      BUGFIX: Mark the rule's restoration process as completed always (#14048)
      removed formateoverview section (#13994)
      Update promu
      bugfix: API: encode empty Vector/Matrix as []
      test: API: check empty responses
      refactor: API: separate typed and unsafe marshalling
      refactor: API: be explicit that we marshal empty objects
      tests: API: Let nil expected response mean skip check
      tests: API: Use jsoniter when encoding
      tests: API: simplify check of error response
      Prepare v2.52 release
    gotjosh committed May 3, 2024
    Configuration menu
    Copy the full SHA
    530e146 View commit details
    Browse the repository at this point in the history