Commit graph

55 commits

Author SHA1 Message Date
Matvey Kukuy
85de2f65af Removing excessive OSS_INSTALLATION from dev setting 2022-06-13 16:13:24 +03:00
Matvey Kukuy
63a4f0ea25
Merge pull request #6 from grafana/docs-refresh-before-oss
OSS Docs refresh
2022-06-13 16:00:02 +03:00
Matvey Kukuy
34e94ce823 Slack polishing & docs 2022-06-13 15:33:56 +03:00
Innokentii Konstantinov
48bfe86d62
Add cloud connection statuses on user page (#34)
* Add cloud connection statuses on user page

* Add fixes for oncall hobby docker-compose installation

* Fix for links and for cloud user status at User settings

* Delete cloud api token on cloud disconnect

* Merge branch 'dev' into cloud_connection_statuses_on_user_page

* Fix cloud statuses for users

* Fix usagestats service

* Fix phone verification message in users table

* added request after syncing user

* Add endpoint to create CloudHeartbeat and polish code

* Fix imports

* Check token and heartbeat setting in setup_hertbeat_integration

* Add macthed_users_count in cloud users

* Sync users on token change

* Fix query param

* Fix tests

* Heartbit button logic, tab width fix, coount users fix

* Solve problem of existent cloud heartbeat integration

* Solve problem of existent cloud heartbeat integration 2

* Solve problem of existent cloud heartbeat integration 3

* fix build

* build fix, styles for env variables description

Co-authored-by: Ildar Iskhakov <ildar.iskhakov@grafana.com>
Co-authored-by: Yulia Shanyrova <yulia.shanyrova@grafana.com>
2022-06-13 16:29:08 +04:00
Ildar Iskhakov
b3add5c9b8 Fix typo in template 2022-06-13 13:38:40 +03:00
Ildar Iskhakov
385738dd48 Merge branch 'dev' of https://github.com/grafana/oncall into dev 2022-06-13 13:38:02 +03:00
Ildar Iskhakov
e5b55507d9 Fix typo in templates 2022-06-13 13:37:48 +03:00
Ildar Iskhakov
c2c503788b
Merge pull request #37 from grafana/refactor-integrations
Refactor integrations
2022-06-13 12:15:58 +03:00
Ildar Iskhakov
f81227a2d1 Fix linting 2022-06-13 11:43:24 +03:00
Ildar Iskhakov
570b832225 Fix linting 2022-06-13 11:27:41 +03:00
Matvey Kukuy
78f7d960d6 Polishing... 2022-06-10 22:58:46 +03:00
Matvey Kukuy
7dbc8dcdc6 Developer setup update 2022-06-10 17:51:50 +03:00
Matvey Kukuy
43e9e6843d Developer setup update 2022-06-10 17:32:58 +03:00
Ildar Iskhakov
7b385a8790 Refactor integrations 2022-06-09 23:27:40 +03:00
Matvey Kukuy
60a30f7d6e
Merge pull request #13 from grafana/remove-demo-token-related-code
Remove demo token related code/logic
2022-06-09 20:01:22 +03:00
Matvey Kukuy
8b1c5e7f24
Merge pull request #28 from grafana/hobby-docker-compose
Add docker compose stack
2022-06-09 17:38:38 +03:00
Matvey Kukuy
cdf22c3681 Flake 2022-06-09 17:18:40 +03:00
Matvey Kukuy
14a4f49840 Up 2022-06-09 17:01:46 +03:00
Matias Bordese
0e26568857 Remove demo token related code/logic 2022-06-09 09:16:10 -03:00
Innokentii Konstantinov
3fae0c9ff2 Fix always error message for cloud notifications 2022-06-09 15:48:43 +04:00
Innokentii Konstantinov
94af30b8bb
Fixes and logging to debug cloud notifications (#31) 2022-06-09 15:11:30 +04:00
Innokentii Konstantinov
94cedd28d9 Merge branch 'dev' into grafana_cloud_notifications 2022-06-09 12:57:49 +04:00
Innokentii Konstantinov
4818fd801c Small improvements 2022-06-09 12:47:22 +04:00
Ildar Iskhakov
b1fe53ca68 Add settings file for hobby 2022-06-09 11:26:09 +03:00
Innokentii Konstantinov
2de3e17e3d Fix tests 2022-06-08 20:33:53 +04:00
Innokentii Konstantinov
d8c4560946 Fix tests 2022-06-08 20:27:54 +04:00
Innokentii Konstantinov
587fdb441d Fix default value for OSS_INSTALLATION 2022-06-08 20:23:26 +04:00
Innokentii Konstantinov
5a8f3a083d Fix tests 2022-06-08 20:20:22 +04:00
Innokentii Konstantinov
f3e93d09c2 Fix OSS default value 2022-06-08 20:15:39 +04:00
Innokentii Konstantinov
778f8688ef Fix tests 2022-06-08 20:15:07 +04:00
Innokentii Konstantinov
2f23cd4d54 Fix tests 2022-06-08 18:55:44 +04:00
Innokentii Konstantinov
af06d6491b Add info throttler 2022-06-08 18:25:58 +04:00
Innokentii Konstantinov
5be51de1ea Sync only admins and editors 2022-06-08 18:14:50 +04:00
Innokentii Konstantinov
e277534f32 Sync only admins and editors 2022-06-08 17:31:55 +04:00
Innokentii Konstantinov
c1f9899e5f Clean up settings 2022-06-08 17:31:12 +04:00
Innokentii Konstantinov
c82e06a1e0 Add "grafana_cloud_connection" feature 2022-06-08 17:12:29 +04:00
Innokentii Konstantinov
1f49265079 Fix sync_user_with_cloud 2022-06-08 15:38:08 +04:00
Innokentii Konstantinov
893da302e1 Fix cloud_users view 2022-06-08 15:04:23 +04:00
Innokentii Konstantinov
6d7c478bfc Add periodic task to sync users with cloud 2022-06-08 12:23:24 +04:00
Ildar Iskhakov
72332eddfc Add pymysql, bump django-mysql version 2022-06-08 11:11:50 +03:00
Innokentii Konstantinov
308e59c769 Add disconnect cloud endpoint 2022-06-08 12:07:30 +04:00
Michael Derynck
583835f8d4
Fix too many tasks being created for create contact points (#12)
Fix too many tasks being created for create_contact_points_for_datasource task

Co-authored-by: Julia <ferril.darkdiver@gmail.com>
2022-06-06 12:04:31 -06:00
Matias Bordese
9f89897264 Drop data migrations setting up demo tokens 2022-06-06 12:29:25 -03:00
Innokentii Konstantinov
5a0150192e Push migration 2022-06-06 19:05:50 +04:00
Innokentii Konstantinov
5d18e636a2 Fix live_settings search 2022-06-06 18:08:32 +04:00
Innokentii Konstantinov
ae0845d6a7 Add migration 2022-06-06 16:36:49 +04:00
Innokentii Konstantinov
8748240172 Remove token from cloud_connection view 2022-06-06 16:20:05 +04:00
Innokentii Konstantinov
829ed8230b Make CloudConnection instance wide 2022-06-06 16:02:09 +04:00
Innokentii Konstantinov
4ef1ba9eb5 Add views 2022-06-05 19:09:40 +04:00
Innokentii Konstantinov
d182d4c305 Simplify sync with cloud system 2022-06-05 13:15:17 +04:00