Maxim
ac0610e9b6
Merge branch 'dev' into add-settings-button
2022-10-06 16:15:14 +03:00
Maxim
8d5299c476
add settings button to new schedules list
2022-10-05 11:32:10 +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
Vadim Stepanov
a96f7315d4
fix constructSyncErrorMessage for empty JsonData
2022-10-04 12:55:19 +01:00
Gilberto Junior
a7c37b2fba
Pagerduty migrator/add scripts ( #403 )
...
* Script to import users from pagerduty to Grafana
* Added README
* Update tools/pagerduty-migrator/scripts/README.md
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
* Update tools/pagerduty-migrator/scripts/add_users_pagerduty_to_grafana.py
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
* Update tools/pagerduty-migrator/scripts/add_users_pagerduty_to_grafana.py
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
* Update tools/pagerduty-migrator/scripts/add_users_pagerduty_to_grafana.py
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
* Update tools/pagerduty-migrator/scripts/add_users_pagerduty_to_grafana.py
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
* Update tools/pagerduty-migrator/scripts/add_users_pagerduty_to_grafana.py
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
* Adjusted script to follow project pattern
* Changed variable name.
* Guidance for running the script
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
2022-10-04 10:19:13 +01: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
0e1295bb32
Merge pull request #609 from grafana/iskhakov/bump-cryptography
...
Bump cryptography version
2022-10-04 17:05:16 +08:00
Ildar Iskhakov
2bc36440e6
Bump cryptography vertsion
2022-10-04 16:58:35 +08:00
Ildar Iskhakov
330116b415
Merge pull request #608 from grafana/iskhakov/helm-values-fix
...
Fix code styling in helm chart
2022-10-04 16:49:38 +08:00
Ildar Iskhakov
e32eecf6ff
Fix code styling in helm chart
2022-10-04 16:48:33 +08:00
Ildar Iskhakov
3ad4f60d69
Merge pull request #344 from vsmanu/343-node-selection-in-helm
...
343: node selection for helm chart - engine only - Initial commit
2022-10-04 16:45:24 +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
1d239fac52
Merge pull request #605 from grafana/matiasb/update-schedule-tests-clear-org-cache
...
Clear users cache before schedule tests logic/asserts
2022-10-03 15:08:00 -03:00
Matias Bordese
2a3fc397db
Clear users cache before schedule tests logic/asserts
2022-10-03 15:00:23 -03:00
Matias Bordese
802a114889
Merge pull request #603 from grafana/matiasb/fix-empty-schedule-related-users
...
Fix related_users for no-shifts schedule
2022-10-03 14:39:48 -03:00
Matias Bordese
f7c7803807
Fix related_users for no-shifts schedule
2022-10-03 14:27:22 -03:00
Michael Derynck
0ee8f3e42b
Update changelog for v1.0.39
2022-10-03 11:18:49 -06:00
Rares Mardare
565c1dc201
Merge pull request #601 from grafana/rares/fix-schedule-id=new
...
fix for webhook
2022-10-03 17:33:54 +03:00
Rares Mardare
6338e58783
fix for webhook
...
linter
2022-10-03 17:25:13 +03:00
Maxim Mordasov
58b681f075
Merge pull request #600 from grafana/rares/fix-schedule-id=new
...
schedules fix
2022-10-03 16:49:30 +03:00
Rares Mardare
c7d02deaf8
remove unused
...
linter
2022-10-03 15:19:24 +03:00
Rares Mardare
dd55c5a9f9
schedules fix
2022-10-03 15:14:14 +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
2bfb834e92
Update changelog for v1.0.38
2022-09-30 12:40:22 -06: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
Matias Bordese
e89a2f86a5
Merge pull request #586 from grafana/matiasb/576-slack-next-shifts-day-after-end
...
Update slack lookup days when checking for next shift
2022-09-30 13:16:52 -03: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
Maxim Mordasov
1351e7e1ec
implement light theme for new schedules ( #585 )
2022-09-30 15:28:17 +01:00
Vadim Stepanov
22cb36bbb2
Simplify README.md commands ( #578 )
...
* .env_hobby -> .env
* update instructions
* pull only engine
* spelling
* remove GRAFANA_USER and GRAFANA_PASSWORD
* .env -> .env.dev
2022-09-29 13:06:33 +01:00
Rares Mardare
81df9c4838
Merge pull request #520 from grafana/472-wrong-team
...
472 wrong team
2022-09-29 14:59:52 +03:00
Vadim Stepanov
526b04f71e
change alert group naming for demo alert link ( #571 )
2022-09-29 14:09:54 +03:00
Vadim Stepanov
72e3a8c1a7
Update docker-compose version to 3.8 ( #577 )
...
* update docker-compose to 3.8 + cleanup
* change single quote to double
* make cpus string
* use extension field for oncall environment
2022-09-29 14:09:29 +03:00
Vadim Stepanov
20b8dbc2fd
lint
2022-09-29 08:45:15 +01: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
Rares Mardare
3a83516a2b
map to /incidents
2022-09-28 16:08:14 +03:00
Rares Mardare
e040494e24
Merge pull request #573 from grafana/rares/yarnlock-update
...
yarnlock update
2022-09-28 14:25:34 +03:00
Rares Mardare
1f5a3dc2f0
yarnlock update
2022-09-28 14:10:04 +03:00
Joey Orlando
0afb377117
Feat 380/311 - make plugin configuration error messages more human readable/actionable ( #563 )
...
* remove unused imports
* remove unused/redundant jsx comment
* don't show pluginStatusMessage as a styled link
* show more human readable plugin configuration errors
2022-09-27 17:31:25 +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
645b78d033
conditional useStore
2022-09-26 14:17:17 +03:00
Rares Mardare
2bbddb5357
linter
2022-09-26 14:10:36 +03:00
Rares Mardare
cbb0f7c024
build fix
2022-09-26 14:06:30 +03:00
