Commit graph

476 commits

Author SHA1 Message Date
Innokentii Konstantinov
0816813237 Handle 404 for get_alerting_config 2022-11-18 17:07:39 +08:00
Innokentii Konstantinov
f5fd3dd76b Fixes to clean_slack_channel_leftovers 2022-11-16 18:23:49 +08:00
Innokentii Konstantinov
f9a9c1d978
Cleanup on deletion/archivation of slack channel (#822)
* Cleanup on deletion/archivation of slack channel

* Bulk update of organizations, filter channel filters by org

* Optimize org bulk update
2022-11-16 17:56:05 +08:00
Innokentii Konstantinov
043700d228
Add additional validation for route's position field (#831)
* Add test for out of range route's order value

* Add additional validation for route's position when manual ordering is applied

* Remove print()

* Remove print
2022-11-16 17:55:53 +08:00
Michael Derynck
5143393e4b
Merge pull request #820 from grafana/mderynck/twilio-api-key-permission
Twilio add simple check if using API key instead of AUTH token
2022-11-10 08:23:32 -07:00
Joey Orlando
c7c3aa823c
local dev setup - fixes for some minor issues (#821)
* use docker compose instead of docker-compose

the former is the newer version, latter is being deprecated

* default to using latest version of grafana, not main

main is "bleeding-edge" grafana, use the more stable "latest" tag

* support requirements-enterprise.txt for both docker/non-docker setups

* backend-bootstrap make command should install enterprise
requirements if the file is there

* only mount the sqlite db file in docker-compose if using sqlite as the DB
2022-11-10 16:04:30 +01:00
Michael Derynck
d15a507763 Add simple check if using API key instead of AUTH token 2022-11-09 21:52:42 -07:00
Michael Derynck
04d2c4ac19
Merge pull request #808 from grafana/mderynck/region-reroute-fix-headers
Fix organization rerouting headers
2022-11-09 06:52:08 -07:00
Joey Orlando
fd4877408a
remove grafana_plugin_management django app (#812)
* remove grafana_plugin_management django app

it seems to be no longer used or referenced. In addition apps.api.serializers.organization.PluginOrganizationSerializer was only
referenced from within grafana_plugin_management and is thereby safe
to remove.
2022-11-09 13:53:59 +01:00
Joey Orlando
1177e44cc7
enterprise dev changes + few other small changes (#802)
* support enterprise development in docker

* fix flaky mysql healthcheck command

I was getting the mysql_to_create_grafana_db and oncall_db_migration prematurely starting up
this commit changes the healthcheck used here to
be the same as what is used in docker-compose-mysql-rabbitmq.yml

* upgrade docker-compose config files to 3.9

3.8 does not actually support the "long form" version of depends_on
see here for more info https://stackoverflow.com/a/54249757
https://docs.docker.com/compose/compose-file/compose-file-v3/#depends_on

* add make init command and update documentation

* cleanup gitignore files
2022-11-09 07:21:33 +01:00
Michael Derynck
6b86c4ceff Avoid key error 2022-11-08 15:46:38 -07:00
Michael Derynck
1002d94787 Add content type header, remove host 2022-11-08 15:40:21 -07:00
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