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

v1.9.13 #4920

Merged
merged 7 commits into from
Aug 23, 2024
Merged

v1.9.13 #4920

merged 7 commits into from
Aug 23, 2024

Commits on Aug 22, 2024

  1. Configuration menu
    Copy the full SHA
    6692536 View commit details
    Browse the repository at this point in the history
  2. Add logging for invalid api_tokens during sync (#4905)

    # What this PR does
    Add logging for when we skip an organization for sync if it is missing
    its api token.
    
    ## Which issue(s) this PR closes
    
    Related to [issue link here]
    
    <!--
    *Note*: If you want the issue to be auto-closed once the PR is merged,
    change "Related to" to "Closes" in the line above.
    If you have more than one GitHub issue that this PR closes, be sure to
    preface
    each issue link with a [closing
    keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
    This ensures that the issue(s) are auto-closed once the PR has been
    merged.
    -->
    
    ## Checklist
    
    - [x] Unit, integration, and e2e (if applicable) tests updated
    - [x] Documentation added (or `pr:no public docs` PR label added if not
    required)
    - [x] Added the relevant release notes label (see labels prefixed w/
    `release:`). These labels dictate how your PR will
        show up in the autogenerated release notes.
    mderynck authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    042fb49 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. optionally prefix oncall api path with grafana sub url (#4910)

    # What this PR does
    consider the grafanaSubUrl in case Grafana is served from subpath
    
    ## Which issue(s) this PR closes
    
    Related to 
    grafana/oncall-private#2656
    #4850
    
    <!--
    *Note*: If you want the issue to be auto-closed once the PR is merged,
    change "Related to" to "Closes" in the line above.
    If you have more than one GitHub issue that this PR closes, be sure to
    preface
    each issue link with a [closing
    keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
    This ensures that the issue(s) are auto-closed once the PR has been
    merged.
    -->
    
    ## Checklist
    
    - [x] Unit, integration, and e2e (if applicable) tests updated
    - [x] Documentation added (or `pr:no public docs` PR label added if not
    required)
    - [ ] Added the relevant release notes label (see labels prefixed w/
    `release:`). These labels dictate how your PR will
        show up in the autogenerated release notes.
    brojd authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    5f5eefb View commit details
    Browse the repository at this point in the history
  2. Fix api_token not being updated (#4912)

    # What this PR does
    Fixes organization api_token not being updated when it differs from what
    is stored in the DB.
    
    ## Which issue(s) this PR closes
    
    Related to [issue link here]
    
    <!--
    *Note*: If you want the issue to be auto-closed once the PR is merged,
    change "Related to" to "Closes" in the line above.
    If you have more than one GitHub issue that this PR closes, be sure to
    preface
    each issue link with a [closing
    keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
    This ensures that the issue(s) are auto-closed once the PR has been
    merged.
    -->
    
    ## Checklist
    
    - [x] Unit, integration, and e2e (if applicable) tests updated
    - [x] Documentation added (or `pr:no public docs` PR label added if not
    required)
    - [x] Added the relevant release notes label (see labels prefixed w/
    `release:`). These labels dictate how your PR will
        show up in the autogenerated release notes.
    mderynck authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    b2b64da View commit details
    Browse the repository at this point in the history
  3. update go toolchain version to use the 1.N.P syntax (#4877)

    # What this PR does
    
    Fixes [this CodeQL
    warning](https://github.com/grafana/oncall/security/code-scanning/tools/CodeQL/status/configurations/automatic/69f48dd4390b44ab31e994b324fcb2b55dc7b51c7542feb4e14e5a6a5b7f869b):
    <img width="1246" alt="Screenshot 2024-08-20 at 15 10 42"
    src="https://github.com/user-attachments/assets/7e643a71-4c36-47dc-9dff-cb666419286f">
    
    
    [Go docs](https://go.dev/doc/toolchain#version) on 1.N.P syntax
    versioning
    
    ## Checklist
    
    - [ ] Unit, integration, and e2e (if applicable) tests updated
    - [x] Documentation added (or `pr:no public docs` PR label added if not
    required)
    - [x] Added the relevant release notes label (see labels prefixed w/
    `release:`). These labels dictate how your PR will
        show up in the autogenerated release notes.
    joeyorlando authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    fefa9d1 View commit details
    Browse the repository at this point in the history
  4. Add more validation when updating api_token (#4918)

    # What this PR does
    Skip updating stored api_token for Grafana if it does not look like one.
    Note: Exact format is not checked (prefix) since there are some
    differences between versions for what API tokens might look like and
    this should tolerate those differences.
    
    ## Which issue(s) this PR closes
    
    Related to [issue link here]
    
    <!--
    *Note*: If you want the issue to be auto-closed once the PR is merged,
    change "Related to" to "Closes" in the line above.
    If you have more than one GitHub issue that this PR closes, be sure to
    preface
    each issue link with a [closing
    keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
    This ensures that the issue(s) are auto-closed once the PR has been
    merged.
    -->
    
    ## Checklist
    
    - [x] Unit, integration, and e2e (if applicable) tests updated
    - [x] Documentation added (or `pr:no public docs` PR label added if not
    required)
    - [x] Added the relevant release notes label (see labels prefixed w/
    `release:`). These labels dictate how your PR will
        show up in the autogenerated release notes.
    mderynck authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    a577030 View commit details
    Browse the repository at this point in the history
  5. Move validate_grafana_token_format to common location, use in sync_v2 (

    …#4919)
    
    # What this PR does
    Moves validate_grafana_token_format to GrafanaAPIClient, use it in
    sync_v2 to improve logging and skip requests that would not work.
    
    ## Which issue(s) this PR closes
    
    Related to [issue link here]
    
    <!--
    *Note*: If you want the issue to be auto-closed once the PR is merged,
    change "Related to" to "Closes" in the line above.
    If you have more than one GitHub issue that this PR closes, be sure to
    preface
    each issue link with a [closing
    keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
    This ensures that the issue(s) are auto-closed once the PR has been
    merged.
    -->
    
    ## Checklist
    
    - [x] Unit, integration, and e2e (if applicable) tests updated
    - [x] Documentation added (or `pr:no public docs` PR label added if not
    required)
    - [x] Added the relevant release notes label (see labels prefixed w/
    `release:`). These labels dictate how your PR will
        show up in the autogenerated release notes.
    mderynck authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    a25d44d View commit details
    Browse the repository at this point in the history