Commit graph

468 commits

Author SHA1 Message Date
Ildar Iskhakov
c8ddbbfb68
Merge pull request #282 from grafana/iskhakov/fix-django-push-notifications-package
Use forked push-notifications library with fixed migration
2022-07-22 22:33:17 +03:00
Ildar Iskhakov
9c72924881 Use forked push-notifications library with fixed migration 2022-07-22 22:22:59 +03:00
Matias Bordese
7516183a9a
Merge pull request #268 from grafana/matiasb-resolve-web-schedule
Update schedule filter_events to resolve final schedule shifts
2022-07-22 14:20:20 -03:00
Michael Derynck
ff57775368
Change slack URL to be built the same as other engine URLs (#280)
* Change slack login url to be built the same way as other engine urls

* Fix tests

* Change how to override base url in create_engine_url

* Change how to override base url in create_engine_url
2022-07-22 10:02:00 -06:00
Matias Bordese
cf6a43c71e Override shifts use rolling_users 2022-07-22 11:54:53 -03:00
Matias Bordese
4649f1faaa Update schedule tests for missing shift rotation_start 2022-07-22 09:29:34 -03:00
Matias Bordese
1ded234d42 Updates from review, improve readability 2022-07-22 09:13:52 -03:00
Matias Bordese
fdba32a15f Update schedule filter_events to resolve final schedule shifts 2022-07-22 09:13:52 -03:00
Innokentii Konstantinov
4520f9fa34
Merge pull request #278 from grafana/dev
Merge dev to main
2022-07-22 15:50:36 +04:00
Innokentii Konstantinov
c9c6df88c5 Update CHANGELOG.md 2022-07-22 15:24:24 +04:00
Innokentii Konstantinov
5205ceeede
More accurate invalidating of alert group web cache (#277)
* Disable invalidate ag web cache on user save

* Tweak invalidate_ag_web_cache on AlertReceiveChannel save
2022-07-22 14:58:27 +04:00
Yulya Artyukhina
6b456f9820
Merge pull request #220 from grafana/julia-web-schedule-backend-2
Internal api endpoint for oncall shifts
2022-07-22 11:52:22 +03:00
Vadim Stepanov
7627853b68
Merge pull request #273 from grafana/dev
Merge dev to main
2022-07-21 16:13:16 +01:00
Innokentii Konstantinov
619e33c433
Merge pull request #272 from grafana/vadimkerr-patch-1
Update CHANGELOG.md
2022-07-21 19:04:09 +04:00
Vadim Stepanov
f216c9a84a
Update CHANGELOG.md 2022-07-21 16:00:38 +01:00
Vadim Stepanov
c37bfe45b1
Fix timezone naming clash (#271) 2022-07-21 15:49:17 +01:00
Vadim Stepanov
0985cb4cb5
Rollback alert group list rework (#269)
* Revert "Alert list view & caching rework (#216)"

This reverts commit 16bbfbbe

* fix AlertGroupClassicMarkdownRenderer
2022-07-21 15:23:02 +01:00
Vadim Stepanov
684c7742d2
Merge pull request #266 from grafana/dev
Merge dev to main
2022-07-21 10:52:57 +01:00
Vadim Stepanov
11a3a79560
Update CHANGELOG.md (#265) 2022-07-21 10:46:44 +01:00
Vadim Stepanov
eeba2f5b31
Bring back cached_render_for_web (#262) 2022-07-21 09:21:13 +01:00
Yulia Shanyrova
4420414faa
Merge pull request #261 from grafana/260-oncall-narrow-fix
260-oncall-narrow-fix
2022-07-21 10:06:39 +02:00
Yulia Shanyrova
92963e3c8c
Merge pull request #263 from grafana/matiasb-plugin-config-info
Add configured URLs details to plugin config page
2022-07-20 16:49:15 +02:00
Matias Bordese
7c43b32db6 Add configured URLs details to plugin config page 2022-07-20 11:20:49 -03:00
Yulia Shanyrova
f5445ef2be deleted unused css 2022-07-20 15:36:34 +02:00
Ildar Iskhakov
79453dc88d
Merge pull request #259 from grafana/iskhakov/mobile-fix-2
Fix wrong env var for mobile app settings
2022-07-20 14:07:12 +03:00
Ildar Iskhakov
6bf7d7d075 Fix wrong env var for mobile app settings 2022-07-20 13:56:02 +03:00
Julia
b7a0411142 Fix oncall shifts serializer, fix migration, update oncall shift log text 2022-07-20 13:11:16 +03:00
Matvey Kukuy
47ffdb6d11
Merge pull request #251 from k1rk/service-and-ingress-annotations
[helm] enable annotations for external service
2022-07-20 12:16:12 +03:00
Ildar Iskhakov
f130c9f730
Merge pull request #257 from grafana/iskhakov/mobile-app-hotfix
Fixes for the mobile app
2022-07-20 11:46:14 +03:00
Ildar Iskhakov
8e233e760d Fixes for the mobile app 2022-07-20 11:39:08 +03:00
Ildar Iskhakov
7e12254d09
Merge pull request #256 from grafana/iskhakov/mobile-app-fixes
Add fixes for the mobile app
2022-07-20 11:04:35 +03:00
Ildar Iskhakov
c25ced2562 Merge branch 'iskhakov/mobile-app-fixes' of https://github.com/grafana/oncall into iskhakov/mobile-app-fixes 2022-07-20 10:59:38 +03:00
Ildar Iskhakov
035d5e99c7 Fix linter 2022-07-20 10:58:54 +03:00
Innokentii Konstantinov
55fd6fd211 Fix AlertClassicMarkdownTemplater 2022-07-20 11:51:56 +04:00
Ildar Iskhakov
ddcad396e3 Clean up the code 2022-07-20 10:50:04 +03:00
Ildar Iskhakov
ee7a58b5cf Add fixes for the mobile app 2022-07-20 10:26:14 +03:00
Matvey Kukuy
6907477462
Merge pull request #227 from njohnstone2/226-regex-replace
support regex_replace()
2022-07-19 11:16:34 +03:00
Matvey Kukuy
fb9c04ba4e
Merge pull request #253 from grafana/vadimkerr-patch-1
Fix link
2022-07-19 11:15:38 +03:00
Ildar Iskhakov
b4db709ada
Merge pull request #240 from grafana/Matvey-Kuk/add-healthcheck-to-rabbit-docker-compose
Healthckeck for rabbitmq in docker-compose.
2022-07-19 11:12:47 +03:00
Matvey Kukuy
e446335e56 Merge branch 'dev' into Matvey-Kuk/add-healthcheck-to-rabbit-docker-compose 2022-07-19 11:03:26 +03:00
Vadim Stepanov
7248d30796
Fix link 2022-07-19 08:47:17 +01:00
Max Golionko
8b92b03d42
enable annotations for external service 2022-07-19 13:34:17 +08:00
Vadim Stepanov
b94e099663
Merge pull request #248 from grafana/dev
Merge dev to main
2022-07-18 16:26:54 +01:00
Vadim Stepanov
548b055a43
Update CHANGELOG.md (#247) 2022-07-18 09:21:15 -06:00
Vadim Stepanov
5b5798a4e2
Show version mismatch warning only on OSS (#245) 2022-07-18 15:37:02 +01:00
Michael Derynck
447de7059a
Fix references to icons for integrations (#231) 2022-07-18 08:19:55 -06:00
Michael Derynck
9093f513db
Improve installation error handling (#236)
* Add hint to restart Grafana when not able to connect on install, fix handling of 502 during install which did not give useful feedback

* Lint
2022-07-18 08:19:39 -06:00
Michael Derynck
d8931cb05f
Use formatted UTC time for fallback in slack message (#225)
* Use formatted UTC time for fallback in slack message

* Lint
2022-07-18 07:55:05 -06:00
Vadim Stepanov
193519abc0
Add version mismatch warning (#241)
* add version mismatch warning

* add link to update docs
2022-07-18 14:24:03 +01:00
Vadim Stepanov
d6840009b7
Add docs on OSS update (#242)
* add update docs

* add oncall_db_migration pull

* add -f docker-compose.yml to pull command

* add --remove-orphans

* update -> update version header
2022-07-18 14:05:03 +01:00