Commit graph

1368 commits

Author SHA1 Message Date
Vadim Stepanov
d2243ba09b
Add Makefile command for rebuilding images (#817) 2022-11-09 15:43:12 +00:00
Maxim Mordasov
2815fc5ed8
Merge pull request #813 from grafana/schedules-deletion-fix
Fix schedules deletion, remove new schedules feature flag support
2022-11-09 15:33:51 +00:00
Joey Orlando
925c3f4cc4
add port to run-backend-server make command (#815) 2022-11-09 15:42:03 +01:00
Maxim
cae4dc2f11 fix schedules deletion, remove new schedules feature flag support 2022-11-09 14:24:01 +00: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
a27a55b36d
force the plugins/docker drone image to use buildkit (#811)
specify DOCKER_BUILDKIT=1 env var, this will force
it to use buildkit which is what supports skipping
build stages that are not required for the final image
2022-11-09 11:55:58 +01:00
Matvey Kukuy
82b74e115c
Update README.md
Added youtube video link
2022-11-09 12:48:15 +02:00
Joey Orlando
5d3e98867f specify "prod" as the docker build target
locally, docker build works as expected. When not specifying a build target, it builds the last target specified in the Dockerfile (in this case "prod"). On GitHub actions this works properly as well.
However, there seems to be something about the version of docker used on Drone that causes it to build all of the stages (and hence failing on enterprise-dev).

Let's instead just be explicit about which build target to use for both drone and GitHub actions.
2022-11-09 11:30:05 +01:00
Joey Orlando
eca469048f
export MessagingBackends interface (#781) 2022-11-09 09:50:51 +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
c80f8da43f
Merge pull request #664 from grafana/mderynck/allow-twilio-api-keys
Allow use of API keys as alternative to account auth token for Twilio
2022-11-08 10:29: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
Maxim Mordasov
d50130bd55
Merge pull request #769 from grafana/web-schedules-fixes-bunch-3
Web schedules fixes bunch 3
2022-11-08 15:11:29 +00:00
Maxim
1e60fe299f add with permission control 2022-11-08 15:01:31 +00:00
Maxim
33724448bb Merge branch 'dev' into web-schedules-fixes-bunch-3 2022-11-08 13:16:59 +00:00
Maxim
034459c46a anyway show rotations form on error, preload user profile to use proper tz 2022-11-08 13:16:36 +00:00
Vadim Stepanov
131b7e7c5a
helm: allow empty smtp password, bump chart version (#797)
* helm: allow empty smtp password

* don't create the secret in case it's empty

* helm: set EMAIL_USE_TLS to true by default
2022-11-08 12:00:42 +00:00
Ildar Iskhakov
e7641b7539
Fix helm values.yaml, bump helm version (#792) 2022-11-08 17:10:26 +08: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
Maxim
5e58d125c0 make new schedules as default 2022-11-07 17:20:48 +00:00
Matias Bordese
0dd69d9dc5
Merge pull request #796 from grafana/matiasb/enforce-until-on-overrides
Enforce until on override shifts
2022-11-07 14:05:47 -03: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
Yulia Shanyrova
88f736beaf
Merge pull request #754 from grafana/slack-wrongworkspace-warning
live settings availability check has been added
2022-11-07 10:22:46 +01:00
Michael Derynck
6109c7b33e
Merge pull request #787 from grafana/mderynck/unify-template-environments
Use common environment for templates
2022-11-05 00:52:31 -06:00
Michael Derynck
9311b530c2 Update changelog 2022-11-05 00:44:55 -06:00
Michael Derynck
25826690a8 Use common environment for templates 2022-11-05 00:31:51 -06:00
Maxim
59cd574e25 Merge branch 'dev' into web-schedules-fixes-bunch-3 2022-11-04 14:27:43 +00: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
Yulia Shanyrova
f04e72e498
Merge pull request #780 from grafana/666-display-ical-and-terraform-schedules-in-list
666 display ical and terraform schedules in list
2022-11-04 15:21:15 +01:00
Vadim Stepanov
b7043277a4
Specify queue for apps.email.tasks.notify_user_async 2022-11-04 14:20:26 +00:00
Maxim
643247acdf Merge branch 'web-schedules-fixes-bunch-3' of github.com:grafana/oncall into web-schedules-fixes-bunch-3 2022-11-04 13:59:57 +00:00
Maxim
4240333fdf selected days minor fix 2022-11-04 13:59:39 +00:00
Yulia Shanyrova
032664e365 TZ importing deleted 2022-11-04 14:59:00 +01:00
Yulia Shanyrova
a05962cf8e All deleted from ScheduleType, show Export Ical link modal was changed to boolean 2022-11-04 14:43:50 +01:00
Alyssa Wada
40d0cc31a2
Merge pull request #773 from grafana/docs-cta-removal
remove manual CTAs from docs
2022-11-04 07:39:33 -06:00
Yulia Shanyrova
23c6130bad escalation chains list fix, warning component has been added 2022-11-04 11:46:20 +01:00
Ildar Iskhakov
6d28fdf69a
Bump django version and alpine version (#778) 2022-11-04 17:34:49 +08:00
Rares Mardare
ff2f7f9bb9
Merge pull request #767 from grafana/rares/jest-fix-packages
Rares/jest fix packages
2022-11-04 10:50:01 +02:00
Rares Mardare
35b00b702e import 2022-11-04 10:29:17 +02:00