Commit graph

2239 commits

Author SHA1 Message Date
Michael Derynck
32d7cb032f
Merge pull request #1962 from grafana/dev
Merge dev to main
2023-05-17 13:44:42 -06:00
Michael Derynck
e0c1e9974a
Update CHANGELOG.md 2023-05-17 13:39:43 -06:00
Michael Derynck
397f961486
Fix organizations not being deleted by start_cleanup_deleted_organizations (#1950)
Organizations that have been deleted outside OnCall were not being
cleaned up by this task as expected.

- Use PluginAuthToken instead of GCOM token == None to determine if the
oncall organization should be matched in GCOM
- Fix how delete was being checked for the instance, the previous method
does not work.
2023-05-17 12:56:57 +00:00
Rares Mardare
e2284ef337
Fix escalation reordering (#1957)
# What this PR does

Fixed bug in Escalation Chains where reordering an item crashed the list

#1936
2023-05-17 14:48:45 +03:00
Yulia Shanyrova
2cc3be2ee4
Integration input field fix (#1955)
Integration input field fix
2023-05-17 11:36:41 +00:00
Ildar Iskhakov
e97826df94
Allow null for short description in integrations api (#1952)
# What this PR does

## Which issue(s) this PR fixes

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-17 18:43:01 +08:00
dependabot[bot]
3d03146ec5
Bump pymdown-extensions from 9.11 to 10.0 in /engine (#1943)
Bumps
[pymdown-extensions](https://github.com/facelessuser/pymdown-extensions)
from 9.11 to 10.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/facelessuser/pymdown-extensions/releases">pymdown-extensions's
releases</a>.</em></p>
<blockquote>
<h2>10.0</h2>
<ul>
<li><strong>Break</strong>: Snippets: snippets will restrict snippets to
ensure they are under the <code>base_path</code> preventing snippets
relative to the <code>base_path</code> but not explicitly under it.
<code>restrict_base_path</code> can be set to <code>False</code> for
legacy
behavior.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="5e750734b7"><code>5e75073</code></a>
Update JS doc deps</li>
<li><a
href="b7bb4878d6"><code>b7bb487</code></a>
Merge pull request from GHSA-jh85-wwv9-24hv</li>
<li>See full diff in <a
href="https://github.com/facelessuser/pymdown-extensions/compare/9.11...10.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pymdown-extensions&package-manager=pip&previous-version=9.11&new-version=10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/grafana/oncall/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joey Orlando <joey.orlando@grafana.com>
2023-05-17 10:37:49 +00:00
Yulia Shanyrova
d2191766a7
Fix for creating Integration (#1951)
# What this PR does

Fix for creating Integration
After creating Integration we land on Integration page, not a table
Added error notification for TemplateFoEdit obj to avoid crashing
Loading state for AlertGroup List
Small style fixes
2023-05-17 10:28:27 +00:00
Yulia Shanyrova
5fae708d0a
Grouping templating polishing 2 (#1947)
Fixes for:
Suggestions in the code,
Heartbeat,
Deleting integration, 
Editing regexp route,
Style changes
etc
2023-05-16 16:23:40 +03:00
Rares Mardare
319cc72cdd
Rares/templating settings (#1937)
# What this PR does

Iteration on templates&grouping

---------

Co-authored-by: Yulia Shanyrova <yulia.shanyrova@grafana.com>
2023-05-16 11:18:00 +00:00
Joey Orlando
4c5c4f2014
update silk_profiler_enabled logic (#1942) 2023-05-15 16:00:59 -04:00
Joey Orlando
dc6192fb7c
dont enable silk if maintenance mode is enabled (#1941) 2023-05-15 19:53:31 +00:00
Joey Orlando
6b82ae8f69
Merge pull request #1940 from grafana/helm-release/1.2.23
Merge: Release oncall Helm chart 1.2.23
2023-05-15 15:38:06 -04:00
GitHub Actions
b6b30cc0b8 Release oncall Helm chart 1.2.23 2023-05-15 17:36:33 +00:00
Joey Orlando
94283858c7
Merge pull request #1939 from grafana/dev
v1.2.23 dev -> main
2023-05-15 13:34:17 -04:00
Joey Orlando
9f5d98bc00
Update CHANGELOG.md 2023-05-15 13:29:23 -04:00
Vadim Stepanov
64fd124e41
Slack: use user_profile_changed event instead of user_change (#1938)
# What this PR does
Adds a handler for
[user_profile_changed](https://api.slack.com/events/user_profile_changed)
Slack event + updates the Slack app manifest.

This is needed to replace
[user_change](https://api.slack.com/events/user_change) event with
[user_profile_changed](https://api.slack.com/events/user_profile_changed)
event, since using `user_change` can cause a lot of excessive requests
from Slack.

## Which issue(s) this PR fixes
Might be related to
https://github.com/grafana/oncall-private/issues/1803

## 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] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-15 16:32:06 +00:00
Yulia Shanyrova
43b6e34c9e
Grouping templating polishing 1st part (#1907)
# What this PR does

- Design polishing of Integration Table, IntegrationForm
- Pagination for Integrations2 page
- Edit regexp route template modal
- Bug fixes
2023-05-15 08:07:04 +00:00
Ildar Iskhakov
f18858882e
Remove prints (#1924)
# What this PR does

## Which issue(s) this PR fixes

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-15 09:28:01 +08:00
Michael Derynck
059ab54d0c
Merge pull request #1930 from grafana/helm-release/1.2.22
Merge: Release oncall Helm chart 1.2.22
2023-05-12 16:05:26 -06:00
Joey Orlando
9be8080e51
add the ability to set/display "currently undergoing maintenance message" in the UI (#1917)
# What this PR does

add a new endpoint, `GET /maintenance-mode/`, which returns either a
string message pulled from the
`CURRENTLY_UNDERGOING_MAINTENANCE_MESSAGE` env var, or `None` + update
the UI to conditionally show this message if it is set

<img width="1321" alt="Screenshot 2023-05-10 at 11 28 16"
src="https://github.com/grafana/oncall/assets/9406895/833a77fb-3a90-4f9f-88d6-dae0d98d99d4">


## Checklist

- [x] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required) (N/A)
- [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-12 15:44:09 +00:00
Matias Bordese
e57941e650
Minor updates to new/edit webhooks drawer (#1918)
- Do not close drawer when clicking outside of it
 - Update title to show the close icon
 - Add cancel button
 - Move `forward_all` above `data`
 - Enable/Disable `data` based on `forward_all` value
2023-05-12 12:56:07 +00:00
GitHub Actions
226e6f1e63 Release oncall Helm chart 1.2.22 2023-05-12 12:45:44 +00:00
Yulya Artyukhina
a69e66339c
Merge pull request #1928 from grafana/dev 2023-05-12 14:40:13 +02:00
Yulya Artyukhina
a2471fa4db
Update CHANGELOG.md (#1929) 2023-05-12 12:30:10 +00:00
Yulya Artyukhina
62412076a2
Disable "You're going OnCall soon" push notification (#1927)
Disable "You're going OnCall soon" push notification for current user
settings
2023-05-12 11:56:12 +00:00
Salvatore Giordano
c2ac74faa3
add user settings for info notifications (#1926)
# What this PR does

## Which issue(s) this PR fixes

## 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] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-12 10:23:42 +00:00
Ildar Iskhakov
ae5c4d368f
Fix bug with newlines markdown converter (#1925)
# What this PR does

This PR fixes the bug when new lines were ignored for the existing
templates


## Which issue(s) this PR fixes

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-12 11:26:08 +08:00
Ildar Iskhakov
56e7ab9112
Iskhakov/fix frontend tests (#1878)
# What this PR does
```
    /Users/ildariskhakov/src/github.com/grafana/oncall/grafana-plugin/node_modules/@grafana/ui/node_modules/uplot/dist/uPlot.cjs.js:3570
    		stroke ??= transparent;
    		       ^^^

    SyntaxError: Unexpected token '??='
```
#### Fix
upgrade to node 16 
OR
add `uplot` to `transformIgnorePatterns`
## Which issue(s) this PR fixes

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-12 02:20:27 +00:00
Vadim Stepanov
b8f54f1c53
Add docs & logo for AppDynamics integration (#1916)
# What this PR does
Adds docs & logo for AppDynamics integration. 
Main PR in private repo:
https://github.com/grafana/oncall-private/pull/1790.

## Which issue(s) this PR fixes
https://github.com/grafana/oncall-private/issues/1621

## Checklist

- [x] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required)
- No changelog (AppDynamics integration will be only available in cloud)
2023-05-11 16:41:51 +00:00
Joey Orlando
395dfd37d0
fix bug in the "you're going oncall" push notification copy (#1922)
# What this PR does

## Which issue(s) this PR fixes

User reported receiving a push notification that they were going oncall
~12mins before the shift started but the notification copy instead
showed this:

![Screenshot_20230511-105817](https://github.com/grafana/oncall/assets/9406895/a9851c5f-97e1-4e2d-9f3a-fd3a3272ad08)

## Checklist

- [x] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-11 15:48:05 +00:00
Kristian Bremberg
b5ee08e04d
Delete SECURITY.md (#1921)
* delete this custom security.md file since we want to sync from a
central file, namely:
https://github.com/grafana/.github/blob/main/SECURITY.md
2023-05-11 15:24:59 +00:00
Joey Orlando
50df584ebc
bump mysql from 5.7 to 8.0.32 (#1790)
# What this PR does

## Which issue(s) this PR fixes

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-10 17:53:27 +00:00
dependabot[bot]
4516d9f4a2
Bump django from 3.2.18 to 3.2.19 in /engine (#1914)
Bumps [django](https://github.com/django/django) from 3.2.18 to 3.2.19.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="fc42edd2e6"><code>fc42edd</code></a>
[3.2.x] Bumped version for 3.2.19 release.</li>
<li><a
href="eed53d0011"><code>eed53d0</code></a>
[3.2.x] Fixed CVE-2023-31047, Fixed <a
href="https://redirect.github.com/django/django/issues/31710">#31710</a>
-- Prevented potential bypass of v...</li>
<li><a
href="007e46d815"><code>007e46d</code></a>
[3.2.x] Added missing backticks in docs/releases/1.7.txt.</li>
<li><a
href="a37e4d5d6e"><code>a37e4d5</code></a>
[3.2.x] Added stub release notes for 3.2.19.</li>
<li><a
href="963f24cff2"><code>963f24c</code></a>
[3.2.x] Added CVE-2023-24580 to security archive.</li>
<li><a
href="e34a2283f2"><code>e34a228</code></a>
[3.2.x] Post-release version bump.</li>
<li>See full diff in <a
href="https://github.com/django/django/compare/3.2.18...3.2.19">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=django&package-manager=pip&previous-version=3.2.18&new-version=3.2.19)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/grafana/oncall/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-10 12:45:44 +00:00
Joey Orlando
014a9c2ec2
allow the POST incoming alert endpoints to queue create_alert tasks independent of the database status (#1896)
# What this PR does

https://www.loom.com/share/18cc445117de4895a10892d56c7d3699

In preparation to upgrade our cloud databases, this PR makes some minor
changes which, after testing locally, allowed the `POST
/<integration_type>/<alert_channel_key>` endpoints to successfully
receive incoming alerts and queue the celery tasks.

I've tested all of the defined `POST
/integrations/v1/<integration_type>/<alert_channel_key>` endpoints by
sending `POST` requests to an integrations' URL while the MySQL database
was down, bringing the database back up, and ensuring the alerts were
created.

## Some other findings
- the integration heartbeat endpoints will not work as we interact w/
the database to persist the incoming heartbeat instance
- if the integration was created in the last 180 seconds, incoming
alerts will fail due to the way we cache the integration IDs
([code](https://github.com/grafana/oncall/blob/dev/engine/apps/integrations/mixins/alert_channel_defining_mixin.py#L47-L50))
- The `create_alert` celery task is set to `max_retries=None` and
`retry_backoff=True`. This means that the queued tasks will continue
retrying forever w/ an exponential backoff, until the alerts can be
created in the database (ie. when the database is back online).

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated (N/A)
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required) (N/A)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required) (N/A)
2023-05-10 12:36:23 +00:00
Michael Derynck
060ef1d9b6
Merge pull request #1913 from grafana/helm-release/1.2.21
Merge: Release oncall Helm chart 1.2.21
2023-05-09 13:44:34 -06:00
GitHub Actions
53ee99f482 Release oncall Helm chart 1.2.21 2023-05-09 17:57:12 +00:00
Michael Derynck
0b881f13c6
Merge pull request #1912 from grafana/dev
Merge dev to main
2023-05-09 11:54:45 -06:00
Michael Derynck
db1c48d003 Resolve conflicts, merge master 2023-05-09 11:33:07 -06:00
Michael Derynck
b16307333b
Update CHANGELOG.md 2023-05-09 11:18:17 -06:00
Michael Derynck
5992fc3cdc
Merge hotfix to dev (#1911)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Joey Orlando <joey.orlando@grafana.com>
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
Co-authored-by: Ildar Iskhakov <Ildar.iskhakov@grafana.com>
Co-authored-by: Matvey Kukuy <Matvey-Kuk@users.noreply.github.com>
Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
2023-05-09 11:17:27 -06:00
Joey Orlando
49d2f477c7
add important_notification_volume_override to mobile app user settings model (#1893)
# What this PR does

add `important_notification_volume_override` to mobile app user settings
model

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated (N/A)
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required) (N/A)
- [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-09 14:28:47 +00:00
Michael Derynck
135159124e
Webhook response check content length instead of header for length limit (#1900) 2023-05-09 13:55:05 +00:00
Matias Bordese
6974794109
Restore original lint backend drone step (#1904)
Drone builds are broken because the lint step was [changed to run all
lint
tasks](https://github.com/grafana/oncall/pull/1849/files#diff-b54b39f1afced2465e1f3641db9d5bbf4f3a7fcf890996dfedd3c197bcb7f8c7)
and the plugin is not there when running frontend lint commands. Restore
the original step to unblock drone.
2023-05-09 13:04:55 +00:00
Michael Derynck
1ff316b00f
Fix team blocking webhook execution (#1898)
Fix issue where the team of the alert receive channel was being used to
filter webhooks.
2023-05-09 12:59:01 +00:00
Maxim Mordasov
ec6d8c2242
fix-new-schedule-creation (#1902)
# What this PR does

Fix autoclosing new schedule form drawer

## Which issue(s) this PR fixes

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
2023-05-09 12:37:42 +03:00
Matias Bordese
8428d42d24
Fix renamed step in drone deps (#1899)
The Lint Backend step was renamed to Lint Everything
[here](https://github.com/grafana/oncall/pull/1849/files#diff-b54b39f1afced2465e1f3641db9d5bbf4f3a7fcf890996dfedd3c197bcb7f8c7)
2023-05-08 16:25:09 -04:00
Matias Bordese
b51df8a469
Fix renamed step in drone deps (#1899)
The Lint Backend step was renamed to Lint Everything
[here](https://github.com/grafana/oncall/pull/1849/files#diff-b54b39f1afced2465e1f3641db9d5bbf4f3a7fcf890996dfedd3c197bcb7f8c7)
2023-05-08 16:24:51 -04:00
Matias Bordese
2b4d9561cc
Update .drone file signature (#1897) 2023-05-08 19:58:58 +00:00
Matias Bordese
79c7313cc5
Refactor upcoming shifts to use cached final schedule data (#1891) 2023-05-08 19:01:24 +00:00