Commit graph

1199 commits

Author SHA1 Message Date
Michael Derynck
cbde8cd680 Merge branch 'dev' into add-region-to-organization 2022-10-28 09:20:16 -06:00
Joey Orlando
5a4c3d6d77
remove POST /api/internal/v1/custom_buttons/{id}/action (#734)
* remove POST /api/internal/v1/custom_buttons/{id}/action
2022-10-28 10:44:37 +02:00
Michael Derynck
942e30bdb3 Lint 2022-10-27 15:47:53 -06:00
Michael Derynck
9d7c370752 Merge branch 'dev' into add-region-to-organization 2022-10-27 15:41:35 -06:00
Michael Derynck
a912a786de Add tests 2022-10-27 15:40:46 -06:00
Joey Orlando
f931ef3992
Merge pull request #730 from grafana/revert-723-revert-708-jorlando/rbac
Revert 723 revert 708 jorlando/rbac
2022-10-27 15:44:48 +02:00
Joey Orlando
7974f32239
Revert "Revert "Remove migration-tool Django app and UI page (#708)"" 2022-10-27 15:42:21 +02:00
Joey Orlando
d9c6104208
Merge pull request #729 from grafana/dev
release v.1.0.46
2022-10-27 15:35:42 +02:00
Ildar Iskhakov
00315e5c2d
Merge branch 'main' into dev 2022-10-27 21:28:44 +08:00
Joey Orlando
726650fe4c
Update CHANGELOG.md (#728) 2022-10-27 15:23:17 +02:00
Joey Orlando
627afe37e1
Remove references to Alert.migrator_lock attribute
This commit patches issue related to #708.

#708 forgot to remove attributes on models outside of the migration_tool django app that were referencing model attributes from migration_tool.

The only attribute that referenced a field in migration_tool was migrator_lock on the Alert model. This commit removes any references to that attribute.
2022-10-27 13:52:03 +02:00
Joey Orlando
945d29cf47
Update CHANGELOG.md 2022-10-27 12:17:20 +02:00
Joey Orlando
55b23c7d59
Merge pull request #723 from grafana/revert-708-jorlando/rbac
Revert "Remove migration-tool Django app and UI page (#708)"
2022-10-27 12:13:50 +02:00
Joey Orlando
56c6a25dfb Revert "Remove migration-tool Django app and UI page (#708)"
This reverts commit 94934bf3e4.
2022-10-27 12:12:57 +02:00
Joey Orlando
77b85450b1
release v1.0.44
release v1.0.44
2022-10-27 11:09:40 +02:00
Joey Orlando
e70eaaacc0
symlink grafana-plugin/CHANGELOG.md from root CHANGELOG.md (#721) 2022-10-27 17:03:03 +08:00
Ildar Iskhakov
440a5ee004
Update CHANGELOG.md 2022-10-27 16:02:05 +08:00
Joey Orlando
d19f135756
revert object destructuring changes which affect the value of 'this' (#719)
* revert object destructuring changes which affect the value of 'this'

* update CHANGELOG.md
2022-10-27 15:51:19 +08:00
Joey Orlando
94934bf3e4
Remove migration-tool Django app and UI page (#708)
* remove migration_tool app (#687)
* remove migration-tool page (#699)
2022-10-26 15:47:08 +02:00
Matias Bordese
8c1f1499cf
Merge pull request #716 from grafana/matiasb/fix-incident-log-no-backend
Fix error when generating log line for non-handled messaging backend
2022-10-26 10:28:16 -03:00
Matias Bordese
2c8c66a8c8 Not previously handled backends (eg. mobile) could end here without a messaging backend 2022-10-26 09:30:13 -03:00
Michael Derynck
8393733bcb
Merge pull request #714 from grafana/dev
Merge dev to main
2022-10-25 13:54:43 -06:00
Michael Derynck
ae65f9b782
Merge branch 'main' into dev 2022-10-25 13:47:18 -06:00
Michael Derynck
d32cbb82aa
Merge pull request #713 from grafana/update-changelog-1.0.43
Update changelog for v1.0.43
2022-10-25 13:43:06 -06:00
Michael Derynck
c46e3bef01 Update changelog for v1.0.43 2022-10-25 13:42:32 -06:00
Michael Derynck
57f3ce5468
Merge pull request #712 from grafana/mderynck/add-check-notify-group-task
Add check for usergroup to notify group task
2022-10-25 12:55:17 -06:00
Michael Derynck
a37df38930 Merge branch 'dev' into mderynck/add-check-notify-group-task 2022-10-25 12:50:12 -06:00
Matias Bordese
ff4d7991cf
Merge pull request #711 from grafana/matiasb/schedules-list-filter-by-type
Add optional type filter to internal schedules endpoint
2022-10-25 15:48:58 -03:00
Matias Bordese
8e2bcf5274 Fix failing test related to users org caching 2022-10-25 14:27:27 -03:00
Michael Derynck
ef097fcdd9 Add check for usergroup to notify group task 2022-10-25 10:23:19 -06:00
Matias Bordese
565cb84bb1 Add optional type filter to internal schedules endpoint 2022-10-25 12:51:06 -03:00
Innokentii Konstantinov
2c6a27154f
Support mutliregion telegram (#676)
* Support mutliregion telegram

* Fix test_personal_message

* Fix tg verification code tests

* Simplify /start cmd handler

* Comment about link with org_id in tg msg
2022-10-25 14:53:07 +08:00
Michael Derynck
37825059ff Add region sync and reverse proxy for migration 2022-10-24 21:25:32 -06:00
Michael Derynck
5955b2a81c Remove unused function 2022-10-24 11:15:58 -06:00
Vadim Stepanov
f4be298624
Merge pull request #705 from grafana/vadimkerr/resolution-note-fix-changelog
Update CHANGELOG.md
2022-10-24 16:35:03 +01:00
Vadim Stepanov
7b6381db80
Update CHANGELOG.md
(cherry picked from commit e83249ac31)
2022-10-24 16:33:45 +01:00
Vadim Stepanov
e83249ac31
Update CHANGELOG.md 2022-10-24 16:32:53 +01:00
Vadim Stepanov
69231801e8
Merge pull request #703 from grafana/vadimkerr/resolution-note-hotfix
Fix resolution note issue
2022-10-24 16:22:03 +01:00
Ben Sully
b3d921c16c
Remove 'emoji' property from Slack markdown blocks in resolution notes (#702)
I'm seeing this error in the logs:

> invalid additional property: emoji [json-pointer:/blocks/0/text]

It looks like the 'emoji' argument is not supported when type: mrkdwn.
This PR removes that property in the same place that the change
to mrkdwn was made - see [this
PR](https://github.com/grafana/oncall/pull/646).

(cherry picked from commit 6ef687061c)
2022-10-24 16:20:28 +01:00
Ben Sully
6ef687061c
Remove 'emoji' property from Slack markdown blocks in resolution notes (#702)
I'm seeing this error in the logs:

> invalid additional property: emoji [json-pointer:/blocks/0/text]

It looks like the 'emoji' argument is not supported when type: mrkdwn.
This PR removes that property in the same place that the change
to mrkdwn was made - see [this
PR](https://github.com/grafana/oncall/pull/646).
2022-10-24 16:15:04 +01:00
Michael Derynck
a3a0b22947 Merge branch 'dev' into add-region-to-organization 2022-10-24 09:14:30 -06:00
Vadim Stepanov
5f1523b776
Add tiny deployment using SQLite and Redis (#611)
* add docker-compose-tiny.yml

* rename docker compose files, add info on tiny setup to readme

* add link to mysql-rabbitmq

* typo

* docker-compose-sqlite-redis.yml -> docker-compose.yml
2022-10-24 14:08:40 +01:00
Joey Orlando
6e5cb4e8a7
[UI] fix eslint/prettier warnings (#678)
* UI spring cleaning

- fix ~570 outstanding eslint warnings
- make eslint force user to correct warnings
- remove .css files that are not referenced
- remove dummy.tsx as it is not consumed anywhere
- remove a few functions that were "dead code" (ie. not consumed anywhere)
- remove commented out blocks of code that had no explanatory comments surrounding them

* add prettier to pre-commit configuration

* change ignoreRestSiblings to true

we have a few spots in the codebase where we destructure
an object key and then use something like ...restProps
setting this to true allows that

* upgrade from eslint 7.21.0 to 8.25.0
- add @grafana/eslint-config to dev dependencies and pre-commit eslint deps
- add @grafana/eslint-config peer dependencies to package.json

* fix remaining outstanding prettier warnings

* enable noUnusedLocals and noUnusedParameters and fix errors related to this

* make pre-commit complain about eslint warnings

* import from moment-timezone instead of moment

* fix react/display-name eslint warning

* add eslint-plugin-react-hooks to dev deps

this is a peer dependency from @grafana/eslint-config

* turn off react/prop-types

* temporarily turn off react-hooks/exhaustive-deps

add note that it will be turned back on and fixed in next PR

* fix unused import errors after rebase to dev

* fix more new prettier errors

* turn react/no-unescaped-entities eslint rule off

* address PR comment about useReducer

* remove includeTemplateGroup from src/components/AlertTemplates/AlertTemplatesForm.helper.tsx

* update arg typing for refreshPageError

* update handleSyncException typing

* fix strict equality in containers/IntegrationSettings/parts/Autoresolve.tsx

* enhance typing in components/AlertTemplates/AlertTemplatesForm.tsx

* revert small change per Maxim's comment
2022-10-24 20:27:03 +08:00
Ildar Iskhakov
2c0b87d95c
Merge pull request #698 from grafana/dev
Preparing for the release: merge dev to main
2022-10-24 19:27:43 +08:00
Ildar Iskhakov
a60e14c3c6
Update CHANGELOG.md 2022-10-24 19:22:56 +08:00
Ildar Iskhakov
1bf75d601d
Merge pull request #646 from grafana/slack-resolution-note-formatting
Use markdown formatting for web based resolution notes
2022-10-24 19:22:12 +08:00
Ildar Iskhakov
998bcbaa31
Merge pull request #692 from grafana/matiasb/689-slack-slash-command-related-issue
Handle multiple general team manual integrations available
2022-10-24 18:03:19 +08:00
Ildar Iskhakov
7cc01e0585
Merge pull request #670 from pluralsh/helm-smtp
Helm chart: add smtp settings to helm chart
2022-10-24 11:28:22 +08:00
Michael Derynck
724278fbc8 Regenerate migrations after complete to consolidate 2022-10-21 14:03:19 -06:00
Matias Bordese
eb32fa7ba0 Handle scenario when multiple general team manual integrations are available 2022-10-21 14:23:45 -03:00