Michael Derynck
fc78dd98da
Merge pull request #707 from grafana/add-region-to-organization
...
Add region info to organizations
2022-11-08 10:30:53 -07:00
Michael Derynck
f01d754851
Merge dev
2022-11-08 10:14:35 -07:00
Matias Bordese
818747bd07
Merge pull request #798 from grafana/matiasb/start-date-selected-days
...
Ensure start date matches by_day selection
2022-11-08 12:43:46 -03:00
Vadim Stepanov
cd39b67ef1
live settings: treat empty string as empty value ( #805 )
2022-11-08 15:41:12 +00:00
Michael Derynck
6d097b648d
Merge pull request #799 from grafana/mderynck/add-template-flake8-rule
...
Add rule for jinja2.Template to remind common environment use
2022-11-08 08:33:12 -07:00
Matias Bordese
4aca570549
Ensure start date matches by_day selection
2022-11-08 12:24:28 -03:00
Innokentii Konstantinov
e459c70a41
Fix oncallGatewayClient
2022-11-08 16:27:36 +08:00
Innokentii Konstantinov
9c550af721
Support of oncall-gw ( #741 )
...
* Draft support of oncall-gw
* Clean up
* Create oncall connector on org create in gcom
* Naming fixes
* Rework oncall-gateway package. \nMove it from apps.
* Fix typo
2022-11-08 14:43:22 +08:00
Michael Derynck
f320afb269
Add rule for jinja2.Template to remind common environment use
2022-11-07 15:40:49 -07:00
Matias Bordese
a349d39f31
Enforce until on override shifts
2022-11-07 12:35:57 -03:00
Joey Orlando
78d01df864
One startup command to rule them all ( #760 )
...
* Modify `docker-compose-developer` configuration files, and `Makefile`
to support running everything in containers for local development
- Make use of the COMPOSE_PROFILES env var that is supported by
docker-compose to allow swapping-out/turning off certain docker-compose
services.
- add makefile cleanup command. Will remove all docker resources related
to running the project locally
- The "restart grafana container" issue, where users would need
to restart their grafana container when setting up the project for the
first time, is now fixed (make command now runs yarn build:dev before docker-compose startup;
this ensures grafana-plugin/dist is available for grafana container before it starts up)
- The DEVELOPER.md has been updated as well to reflect these new changes. It
has been moved to ./dev/README.md (and references to the old file have
been updated).
- The redis image that is referenced in the docker-compose files
has been pinned to v7.0.5 (latest version as of this commit) to avoid
any surprises w/ future releases.
- remove root .dockerignore in favour of individual .dockerignore files
in ./engine and ./grafana-plugin
2022-11-07 16:34:43 +01:00
Michael Derynck
25826690a8
Use common environment for templates
2022-11-05 00:31:51 -06:00
Maxim Mordasov
387b334d2a
Merge pull request #720 from grafana/matiasb/daily-shifts-by-day
...
Enable daily/by-day shifts option for web schedules
2022-11-04 14:23:09 +00:00
Vadim Stepanov
b7043277a4
Specify queue for apps.email.tasks.notify_user_async
2022-11-04 14:20:26 +00:00
Ildar Iskhakov
6d28fdf69a
Bump django version and alpine version ( #778 )
2022-11-04 17:34:49 +08:00
Michael Derynck
81702ba52d
Merge dev
2022-11-03 12:42:36 -06:00
Michael Derynck
369a23551b
Merge branch 'dev' into add-region-to-organization
2022-11-03 12:41:07 -06:00
Matias Bordese
4f6734dcf5
Update daily/by-day to user group id when generating weekly shifts
2022-11-03 15:26:46 -03:00
Matias Bordese
b1a664df3b
Merge pull request #742 from grafana/matiasb/web-schedules-all-day-as-datetime
...
Update web schedule events to return all-day start/end as datetimes
2022-11-03 14:54:28 -03:00
Matias Bordese
2377d74043
Add multiple ical all-day event for testing
2022-11-03 14:36:42 -03:00
Vadim Stepanov
e2456315af
Allow no-auth SMTP connection for email notifications ( #759 )
...
* DEFAULT_FROM_EMAIL -> EMAIL_FROM
* add EMAIL_FROM live setting
* EMAIL_FROM -> EMAIL_FROM_ADDRESS
* merge dev
* add test for get_from_email
* allow live settings to be null on internal API
* remove redundant tests
2022-11-03 16:18:37 +00:00
Vadim Stepanov
e9df5ab5c9
Send emails from <slug>.grafana.net for cloud ( #766 )
2022-11-03 14:45:13 +00:00
Michael Derynck
e52d738ec3
Merge pull request #763 from grafana/add-region-to-organization-migration-only
...
Migration for regions and organizations
2022-11-03 08:35:13 -06:00
Matias Bordese
e103ec9152
Fix all-day end as datetime value
...
Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
2022-11-03 11:21:42 -03:00
Michael Derynck
5b29ab92ea
Migration for regions and organizations
2022-11-02 16:10:41 -06:00
Matias Bordese
3e2d52ad51
Update web schedule events to return all-day as datetimes
2022-11-02 16:12:37 -03:00
Matias Bordese
98b187acd9
Add support for daily/by-day and custom interval
2022-11-02 16:12:16 -03:00
Matias Bordese
4bc3ed17a8
Make interval check more explicit
2022-11-02 16:12:16 -03:00
Matias Bordese
241283959a
Enable daily/by-day shifts option for web schedules
2022-11-02 16:12:16 -03:00
Michael Derynck
538e28e739
Check user attribute
2022-11-02 10:47:26 -06:00
Michael Derynck
e5c1db4b55
Merge branch 'dev' into mderynck/add-org-id-request-log
2022-11-02 10:38:50 -06:00
Michael Derynck
c2546460f3
Add user and org id to log to make troubleshooting easier
2022-11-02 10:36:12 -06:00
Matvey Kukuy
85d94d342e
Readme about how to add Integrations and Zabbix Integration ( #653 )
...
* Readme and zabbix
* Typos
* Linking
2022-11-02 22:58:47 +08:00
Michael Derynck
a331a3f392
Rename to validate_settings
2022-11-01 18:24:44 -06:00
Michael Derynck
e019c70f67
Handle validation on update, remove redundant get_error call
2022-11-01 18:22:50 -06:00
Michael Derynck
2905423bad
Merge dev
2022-11-01 17:56:03 -06:00
Vadim Stepanov
035584f17e
Enable email backend by default ( #740 )
...
* enable email backend by default, catch empty EMAIL_HOST
* fix tests
* fix tests
* fix tests
2022-11-01 13:48:36 +00:00
Ildar Iskhakov
001a760be7
Update manual_incident.py
2022-11-01 17:23:29 +08:00
Innokentii Konstantinov
4e8982cc81
Add management command to manually verify phone numbers ( #743 )
...
* Add cmd to manully verify phone numbers
* Rework verify_phone command
2022-11-01 16:38:04 +08:00
Matias Bordese
64570cc9fd
Update schedules endpoint to filter by numeric type
2022-10-31 11:08:33 -03:00
Yulia Shanyrova
6b65fc7278
Merge branch 'dev' into 637-telegram-installation-redesign
2022-10-31 12:21:40 +01:00
Michael Derynck
6267e31b22
Check id instead of object to avoid unnecessary query
2022-10-28 15:45:51 -06:00
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
7974f32239
Revert "Revert "Remove migration-tool Django app and UI page ( #708 )""
2022-10-27 15:42:21 +02:00
Ildar Iskhakov
00315e5c2d
Merge branch 'main' into dev
2022-10-27 21:28:44 +08: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