Commit graph

1830 commits

Author SHA1 Message Date
Ben Sully
def8b35e74
Use markdown formatting for web based resolution notes
We would like to include some more sophisticated content in our
resolution notes (specifically URLs), so need the resolution notes to be
rendered as Markdown for this.

This PR changes _all_ resolution note text blocks to be markdown, but
perhaps it would be better to allow the caller to specify that they
would prefer markdown to plain text (this would also allow backwards
compatibility). Let me know if you'd prefer that and I can try and
figure it out!
2022-10-12 13:05:16 +01:00
Joey Orlando
d0b8512992
Grammar 2022-10-12 11:01:17 +02:00
Michael Derynck
bc16795fa8 Allow use of API keys as alternative to account auth token for Twilio credentials 2022-10-11 14:47:16 -06:00
Michael Derynck
fa5d4f2674 Add region_slug column to organization 2022-10-11 12:04:33 -06:00
Yulia Shanyrova
06a5b5570a Slack integration redesign. Changed the message from backend as well 2022-10-11 11:35:51 +02:00
Matias Bordese
f378eab7b7 Allow enabling schedules alpha per organization 2022-10-05 14:06:42 -03:00
Yulya Artyukhina
e695093c6c
Merge pull request #540 from grafana/web-schedule-fixes
Web schedule fixes
2022-10-04 17:01:00 +03:00
Ildar Iskhakov
5187dbf913
Merge pull request #595 from toro-ponz/fix/slack-format-alert-failure
Fix failure of "Format Alert" button on Slack.
2022-10-04 17:05:39 +08:00
Ildar Iskhakov
2bc36440e6 Bump cryptography vertsion 2022-10-04 16:58:35 +08:00
Vadim Stepanov
b84b174e20
Allow multiple database and celery broker types (#582)
* add libs for celery + redis

* move redis & cache config to settings/base.py

* move rmq & celery config to settings/base.py

* BROKER -> BROKER_TYPE

* allow multiple database types

* flake8

* add sqlite db creation to dockerfile

* fix ci

* fix ci

* debug

* remove some defaults

* remove prints

* use local memory as cache on ci

* debug

* add DATABASE_DEFAULTS

* add ci test for sqlite + redis

* add ci test for sqlite + redis

* add ci test for sqlite + redis

* debug

* add redis healthcheck

* fix sqlite

* fix dev settings

* refactor dev settings

* tweak ci settings

* clear cache properly between tests

* move db and broker types to constants

* add librabbitmq deps

* use amqp instead of librabbitmq
2022-10-04 09:25:53 +01:00
Julia
461f284bb5 Merge branch 'dev' into web-schedule-fixes
# Conflicts:
#	engine/apps/schedules/ical_utils.py
#	engine/apps/schedules/models/custom_on_call_shift.py
2022-10-04 11:23:52 +03:00
Matias Bordese
2a3fc397db Clear users cache before schedule tests logic/asserts 2022-10-03 15:00:23 -03:00
Matias Bordese
f7c7803807 Fix related_users for no-shifts schedule 2022-10-03 14:27:22 -03:00
toro_ponz
afae3bc846 Merge remote-tracking branch 'upstream/dev' into fix/slack-format-alert-failure 2022-10-03 19:38:29 +09:00
Matias Bordese
f8314ef9c2
Fix timing issue with schedule tests reusing cached users (#592)
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
2022-10-03 11:37:59 +01:00
Vadim Stepanov
5e272f8565
Fix failing tests due to bug in month calculations (#599) 2022-10-03 11:22:02 +01:00
toro_ponz
a8a88f5c00 remove wasted condition check. 2022-10-03 18:54:56 +09:00
toro_ponz
2355fa3a3c fix failure of "Format Alert" button on Slack. 2022-10-02 06:56:13 +09:00
Michael Derynck
2dda1e0a77
Merge pull request #587 from grafana/fix-resolution-note-missing-user
Catch exception for when oncall user is out of sync with slack user
2022-09-30 11:33:48 -06:00
Michael Derynck
a1c3ba330d Format 2022-09-30 10:26:47 -06:00
Michael Derynck
6dde87afde Message format 2022-09-30 10:16:03 -06:00
Michael Derynck
7d9d239452 Catch exception for when oncall user is out of sync with slack user 2022-09-30 10:14:39 -06:00
Matias Bordese
3e99b26022 Update slack lookup days when checking for next shift 2022-09-30 12:25:51 -03:00
Rares Mardare
81df9c4838
Merge pull request #520 from grafana/472-wrong-team
472 wrong team
2022-09-29 14:59:52 +03:00
Joey Orlando
9f3f691ea4
Feat 549 - add telegram permalink to alert groups http response (#551)
* rename AlertGroup.permalink to slack_permalink

* add telegram key to alert_groups permalinks object in public API response
2022-09-28 16:59:57 +02:00
Tim Willems
516b2c446a
Changed Redis Connection String possibilities (#538)
* Update helm.py

Changed Redis Connection String possibilities
added Redis Username
added Redis Protocol

Co-authored-by: Joey Orlando <joseph.t.orlando@gmail.com>
2022-09-27 17:20:41 +02:00
Rares Mardare
ea54d21b76 Merge branch 'dev' into 472-wrong-team 2022-09-26 13:34:46 +03:00
Michael Derynck
accee4ebbe
Use create_engine_url to add prefix to previous/next links (#553)
* Use create_engine_url to add prefix to previous/next links

* Remove override of get_paginated_response since it is unchanged from parent

* More concise override

* Make both overrides behave the same

* add test for public API alert groups pagination

Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
2022-09-23 10:45:28 +01:00
Matias Bordese
4412ae52d2
Merge pull request #552 from grafana/matiasb/fix-outgoing-webhook-resolve-hostname
Fix outgoing webhook to resolve IP from parsed hostname
2022-09-22 20:22:29 -03:00
Matias Bordese
2988c10c92 Fix outgoing webhook to resolve IP from parsed hostname 2022-09-22 14:35:37 -03:00
Matias Bordese
8c3d5656a2
Merge pull request #548 from grafana/matiasb/rework-bulk-actions
Rework queries for alert groups bulk actions
2022-09-22 10:41:30 -03:00
Joey Orlando
e16064c6ba
#539 - add slack permalink to alert group public API response (#543)
* add .python-version to .gitignore

* add .nvmrc to frontend

Also update DEVELOPER.md to mention optionally using nvm

* update DEVELOPER.md to reflect running successfully locally

* markdown autoformatter styling changes

* add slack permalink to alertgroup public api http response

* update changelog

* address PR comments

- rename permalink to permalinks in alert group public api seralizer
- add permalinks property to AlertGroup model
- update public api alert groups test
- update alertgroups public documentation to include permalinks property

* add default DEBUG = True in dev.py settings
2022-09-22 15:17:17 +02:00
Matias Bordese
859a04e42a Add transaction blocks 2022-09-22 09:15:13 -03:00
Matias Bordese
8e7c6cf554 Rework queries for alert groups bulk actions 2022-09-21 15:50:31 -03:00
Michael Derynck
b6faf425fd Handle parse exception 2022-09-21 12:36:52 -06:00
Michael Derynck
edac2e334f Use phonenumbers package to validate live settings twilio number instead of regex to support EU number 2022-09-21 12:22:05 -06:00
Matias Bordese
1392994d26
Merge pull request #526 from grafana/matiasb/fix-all-day-filter-events
Fix support for all_day events in schedule filter_events
2022-09-21 08:58:06 -03:00
Maxim Mordasov
9330b89101
Schedules alpha fixes (#541)
* schedule alpha major fixes

* Fix shift update for web schedules

* Fix priority level regex, fix getting shifts without duration

* Fix shift update for web schedules

* Fix tests for shift update

* Fix priority level test

* schedule alpha fixes

* add final schedule click handler

* fix date time picker

* fix utc timzeonr time picker

* fix utc time data

* dont use user timezone on start

Co-authored-by: Julia <ferril.darkdiver@gmail.com>
2022-09-21 11:19:59 +01:00
Julia
996e6076ab Remove unnecessary variable 2022-09-20 16:42:58 +03:00
Julia
aeb8de96a2 Update comment for wrong_team_response in UserView 2022-09-20 14:47:42 +03:00
Julia
edba707b42 Fix priority level test 2022-09-20 14:19:32 +03:00
Julia
7571bfa625 Fix tests for shift update 2022-09-20 14:13:47 +03:00
Julia
9b9470b358 Fix shift update for web schedules 2022-09-20 13:33:33 +03:00
Julia
d9609dbcc2 Fix priority level regex, fix getting shifts without duration 2022-09-20 13:20:28 +03:00
Julia
b1ea2b062f Fix shift update for web schedules 2022-09-20 13:19:12 +03:00
Rares Mardare
d71d8c42c6 fetch item with ?from_organization=true 2022-09-16 16:48:05 +03:00
Vadim Stepanov
77984b77ab
Fix empty byday in ICAL rrule (#535) 2022-09-16 12:36:50 +01:00
Julia
c92faf23c6 Add tests for wrong team for user 2022-09-16 11:53:47 +03:00
Julia
4bcdcfa381 Wrong team error for user page 2022-09-16 11:52:38 +03:00
Michael Derynck
07468de0a8
Merge pull request #514 from grafana/fix-delete-organization-log-message
Fix log message
2022-09-13 08:33:25 -06:00