Commit graph

4576 commits

Author SHA1 Message Date
GitHub Actions
f5de5cabfb Release oncall Helm chart 1.9.18 2024-08-29 20:22:25 +00:00
Michael Derynck
8bdb124f58
Merge pull request #4958 from grafana/dev
v1.9.18
2024-08-29 14:04:00 -06:00
Michael Derynck
962cc34432
Compress sync data (#4951)
# What this PR does
- Compresses sync data being sent to engine
- Minor fix to log messages when JSON parse errors occur

## 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.
2024-08-29 18:36:35 +00:00
Rares Mardare
bbc46e0383
e2e to run against 11 (#4942) 2024-08-29 12:01:16 +00:00
Matias Bordese
f5be809b47
Improve schedule filters before generating user calendar export (#4950)
Avoid checking all schedules in an organization when filtering user
events during export.
This should help with some slow requests we are noticing.
2024-08-29 11:56:03 +00:00
Rares Mardare
754fa8728e
Fixed Schedules modals dragging/initial positioning (#4953)
# What this PR does

Closes https://github.com/grafana/oncall/issues/4944
2024-08-29 11:16:10 +00:00
Dominik Broj
bd919f6e74
fix: fix alert group card layout (#4952)
# What this PR does
fix alert group card layout

## Which issue(s) this PR closes

[Related to [issue link
here]](https://raintank-corp.slack.com/archives/C06K1MQ07GS/p1724882302489259)

<!--
*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

- [ ] 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.
2024-08-29 08:24:51 +00:00
Joey Orlando
4285be9aa1
Merge pull request #4949 from grafana/helm-release/1.9.17
Merge: Release oncall Helm chart 1.9.17
2024-08-28 15:21:18 -04:00
GitHub Actions
0c867d864f Release oncall Helm chart 1.9.17 2024-08-28 19:21:00 +00:00
Michael Derynck
27b2300ca2
Merge pull request #4948 from grafana/dev
v1.9.17
2024-08-28 12:51:42 -06:00
Matias Bordese
c281813125
Check for incident enabled before making mobile app request (#4947)
Related to some issues we have noticed in our logs
([example](https://ops.grafana-ops.net/goto/8sa28TqIR?orgId=1)).
Also make sure unexpected responses are logged too.
2024-08-28 17:56:59 +00:00
Michael Derynck
586205368e
Sync process and backend plugin tweaks (#4939)
- Split up sync requests into batches to run concurrently
- Add more logging for when API calls to Grafana fail to parse
- Call sync from backend plugin when status is called
- Lock sync from backend plugin to only run every 5 mins
- Add timer display for API call to sync to return remaining time before
sync can execute
- Remove locks from celery task since it's work is low cost and we lock
in the backend plugin anyways.
2024-08-28 16:34:30 +00:00
Matias Bordese
d3f034b218
Handle a deleted organization triggering auth (#4937)
Related to https://github.com/grafana/oncall-private/issues/2203
2024-08-28 16:32:24 +00:00
Riksus
1840f42644
Make jinja template limits configurable by env var (#4865)
# What this PR does
Fixing variable for jinja templates to env
## Which issue(s) this PR closes
Related to [issue](https://github.com/grafana/oncall/issues/2911)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>
2024-08-28 10:12:03 -06:00
Dominik Broj
0b6fa6ad1d
types improvements (#4945)
# What this PR does

- Fix some types errors when OnCall type checking runs under IRM
- Make type check required on CI


## 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.
2024-08-28 14:43:52 +00:00
Joey Orlando
4aef7b231a
irm tilt changes (#4946) 2024-08-28 10:05:43 -04:00
Joey Orlando
c475a154aa
IRM tilt changes (#4940)
Related to https://github.com/grafana/irm/pull/45
2024-08-27 21:03:30 -04:00
Joey Orlando
ed24fdd0b6
adjust heartbeat and maintenance tests (#4938)
Related to https://github.com/grafana/irm/pull/45
2024-08-27 16:38:39 -04:00
Joey Orlando
bde211986c
changes need for Tilt development in grafana/irm (#4935)
Needed for https://github.com/grafana/irm/pull/45
2024-08-27 10:47:01 -04:00
github-actions[bot]
8cdc93a042
Update make docs procedure (#4913)
Co-authored-by: grafanabot <bot@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2024-08-27 11:28:24 +00:00
Rares Mardare
0965c6ab75
Fixed deprecated imports of H/VGroup in favor of Stack (#4897)
# What this PR does

Closes https://github.com/grafana/irm/issues/10
2024-08-27 09:37:30 +00:00
Joey Orlando
fce6759374
Merge pull request #4933 from grafana/helm-release/1.9.16
Merge: Release oncall Helm chart 1.9.16
2024-08-26 20:33:04 -04:00
GitHub Actions
1e4c7ba774 Release oncall Helm chart 1.9.16 2024-08-27 00:32:39 +00:00
Michael Derynck
a4b3a034a9
Merge pull request #4932 from grafana/dev
v1.9.16
2024-08-26 18:02:13 -06:00
Michael Derynck
3269c9b3a7
Fix incorrect IDs being used to lookup user permissions during sync (#4931)
# What this PR does
- Fixes ID being used to lookup user permissions during sync.
- Reduce level on overly chatty log message

## 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

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] 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.
2024-08-26 22:28:38 +00:00
Michael Derynck
9655a90f23
Fix plugin sync issues (#4930)
# What this PR does
- Fix incorrect response for error message on sync
- Remove sleep delay from sync (natural latency provides enough delay)

## 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

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] 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.
2024-08-26 19:12:18 +00:00
Joey Orlando
50dc094b68
Merge pull request #4929 from grafana/helm-release/1.9.15
Merge: Release oncall Helm chart 1.9.15
2024-08-26 13:18:22 -04:00
GitHub Actions
dd40af8d41 Release oncall Helm chart 1.9.15 2024-08-26 17:18:04 +00:00
Michael Derynck
bc85984251
Merge pull request #4928 from grafana/dev
v1.9.15
2024-08-26 10:38:54 -06:00
Matias Bordese
0ac7c40671
Update org creation to use DB uniqueness constraint (#4926)
Fix issue related to
[logs](https://ops.grafana-ops.net/explore?schemaVersion=1&panes=%7B%2257p%22:%7B%22datasource%22:%22000000193%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22expr%22:%22%7Bnamespace%3D%5C%22amixr-prod%5C%22,%20cluster%3D%5C%22prod-us-central-0%5C%22,%20job%3D%5C%22amixr-prod%2Famixr-engine%5C%22%7D%20%7C%3D%20%5C%22user_management_organization.user_management_organization_stack_id_org_id_727b4929_uniq%5C%22%22,%22queryType%22:%22range%22,%22datasource%22:%7B%22type%22:%22loki%22,%22uid%22:%22000000193%22%7D,%22editorMode%22:%22code%22%7D%5D,%22range%22:%7B%22from%22:%22now-2d%22,%22to%22:%22now%22%7D%7D%7D&orgId=1)
(check for existing org using the unique DB index)
2024-08-26 15:03:26 +00:00
Joey Orlando
6fc342dc15
some minor changes for running oncall via grafana/irm tilt setup (#4927)
Related to the changes under `./packages/grafana-oncall-app` in
https://github.com/grafana/irm/pull/45
2024-08-26 10:55:05 -04:00
Joey Orlando
1ac0ae6ce2
update CODEOWNERS to account for a few extra golang files under grafana-plugin (#4917) 2024-08-26 10:34:12 -04:00
Joey Orlando
0764526acd
update oncall tilt setup (#4911) 2024-08-26 10:33:50 -04:00
Yulya Artyukhina
c87d3018b9
Handle TimeoutError on sending message to Slack (#4916)
# What this PR does

## Which issue(s) this PR closes

Related to https://github.com/grafana/oncall-private/issues/2758

<!--
*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.
2024-08-26 10:27:07 +00:00
Dominik Broj
47478b5e6b
Merge pull request #4922 from grafana/dev
v1.9.14
2024-08-26 07:53:01 +02:00
Dominik Broj
bb7efb655a
chore: more adjustments to irm monorepo (#4915)
# What this PR does

- remove hardcoded plugin id so it can run from IRM monorepo context
- minor e2e tests tweaks

## Which issue(s) this PR closes

Related to https://github.com/grafana/irm/issues/41

<!--
*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

- [ ] 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.
2024-08-26 05:39:07 +00:00
Joey Orlando
e9c6c36107
Merge pull request #4921 from grafana/helm-release/1.9.13
Merge: Release oncall Helm chart 1.9.13
2024-08-23 18:34:35 -04:00
GitHub Actions
9bed3277b1 Release oncall Helm chart 1.9.13 2024-08-23 22:34:08 +00:00
Michael Derynck
7d3e6f2a25
Merge pull request #4920 from grafana/dev
v1.9.13
2024-08-23 16:18:13 -06:00
Michael Derynck
a25d44da1a
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.
2024-08-23 19:52:53 +00:00
Michael Derynck
a5770309d9
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.
2024-08-23 18:21:57 +00:00
Joey Orlando
fefa9d1106
update go toolchain version to use the 1.N.P syntax (#4877)
# What this PR does

Fixes [this CodeQL
warning](69f48dd439):
<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.
2024-08-23 11:49:19 -04:00
Michael Derynck
b2b64da86c
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.
2024-08-23 13:22:54 +00:00
Dominik Broj
5f5eefbc53
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 
https://github.com/grafana/oncall-private/issues/2656
https://github.com/grafana/oncall/issues/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.
2024-08-23 07:47:04 +00:00
Michael Derynck
042fb49aaf
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.
2024-08-22 20:40:18 +00:00
Matias Bordese
66925366a6
Fix flaky test depending on DB ordering (#4907)
See
https://github.com/grafana/oncall/actions/runs/10513279782/job/29128524241
2024-08-22 18:56:59 +00:00
Joey Orlando
86940efb1a
Merge pull request #4909 from grafana/helm-release/1.9.12
Merge: Release oncall Helm chart 1.9.12
2024-08-22 14:44:25 -04:00
GitHub Actions
0d4b0c3ac7 Release oncall Helm chart 1.9.12 2024-08-22 18:44:01 +00:00
Matias Bordese
b09343592b
Merge pull request #4906 from grafana/dev
v1.9.12
2024-08-22 15:02:58 -03:00
Matias Bordese
cd5e9955b9
Make sure organization token is valid before sync (#4904)
Since we will be triggering sync for orgs without a `last_time_synced`
set, we need to make sure the token is valid (previously both,
`last_time_synced` and the token, were updated from the frontend plugin)
2024-08-22 17:49:22 +00:00