Commit graph

66 commits

Author SHA1 Message Date
Matias Bordese
2a5e0dc1f1
Merge pull request #43 from grafana/remove-unused-feature-flag
Remove unused messaging backends feature flag
2022-06-15 14:29:26 -03:00
Ildar Iskhakov
471d29d50d
Update uwsgi.ini 2022-06-15 19:13:50 +03:00
Matias Bordese
3a69ddcc70 Add missing slack settings to live settings mapping 2022-06-15 11:39:12 -03:00
Vadim Stepanov
0a8649fa0e Fix Telegram message template for AlertManager 2022-06-15 13:52:25 +03:00
Ildar Iskhakov
ff22836ec5 Edit README.md, fix linting 2022-06-14 20:47:34 +03:00
Ildar Iskhakov
7a2ebf16ab Edit settings/helm.py 2022-06-14 20:05:29 +03:00
Michael Derynck
4572131951
Merge dev to main (#73)
* Log (failed) attempt to notify a user with viewer role

* Remove old publishing workflow

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Add publishing workflows for next (unreleased) and released documentation

Notable features:
- Merges are blocked by strict Hugo reference checking. However, this
only works for references that resolve within the repository. Once you
have Hugo references to website pages beyond this repository, you will
want to remove this test job.
- Pushes to main are automatically published to "next" documentation
consistent with our other OSS projects.
- Pushes of release tags publish to a versioned directory in the
website. The website uses `v<MAJOR>.<MINOR>.x` versioning and the
"Determine technical documentation version" step will make sure that a
tag such as `v0.20.7` is mapped to `v0.20.x`.
- Pushes to release branches will only be published if there is an
existing corresponding release tag. For example, pushing to a new
release branch `release-0.1000` will not trigger a publish of
documentation until there is a `v0.1000.0` release tag.

> **Note:** I have used a release branch naming convention
`release-<MAJOR>-<MINOR>` which is consistent with grafana/mimir but I
see that in the old amixr repository there are long lived release
branches for patch versions. If that is required. I can update this PR
to support that but I would recommend not including patch versions in
release branch naming unless you have a good reason to do so.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Add helm chaart installation

* s/mimir/oncall/

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Remove https:// prefix from BASE_URL docker env var

* Fix cloud heartbeat name

* Polishing telegram

* Update docker-compose.yml

* Update plugin README  (#48)

* Update README and screenshot, remove plop for build info since version is now displayed prominently

* Sign build

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Build actions (#38)

* Drone, github action changes

* Minor version updates

* Update frontend dependencies

* Re-enable unit test

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Revert stylelint version (#52)

* Revert stylelint version

* Build plugin as well as lint

* Build in previous step

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Update screenshot (#53)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* oncall images for docs (#55)

* Fix chart

* Finalise helm chart

* Update README.md

* Top menu fix

* Fix db encoding

* Add api key docs

* Reverting utf8 fix

* bug fixes

* fix for link for OSS version

* Fixing utf8 and docker compose

* 8080 -> 8000 port for consistency

* Improve the helm chart

* makeReq

* Fixing images

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Add last moment improvements

* Fixing port

* Replace symlink with file for CHANGELOG.MD (#68)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Edit Chart.yaml

* Edit version

* Edit README.md

* Fixing port

* Update README.md

* Fix linting

* image: grafana/oncall

* Merge dev to main (#71)

* Merge dev to main (#54)

* Log (failed) attempt to notify a user with viewer role

* Remove https:// prefix from BASE_URL docker env var

* Fix cloud heartbeat name

* Polishing telegram

* Update docker-compose.yml

* Update plugin README  (#48)

* Update README and screenshot, remove plop for build info since version is now displayed prominently

* Sign build

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Build actions (#38)

* Drone, github action changes

* Minor version updates

* Update frontend dependencies

* Re-enable unit test

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Revert stylelint version (#52)

* Revert stylelint version

* Build plugin as well as lint

* Build in previous step

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Update screenshot (#53)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

Co-authored-by: Matias Bordese <mbordese@gmail.com>
Co-authored-by: Matvey Kukuy <Matvey-Kuk@users.noreply.github.com>
Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Co-authored-by: Matvey Kukuy <matvey@amixr.io>
Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Merge dev to main (#69)

* Log (failed) attempt to notify a user with viewer role

* Remove https:// prefix from BASE_URL docker env var

* Fix cloud heartbeat name

* Polishing telegram

* Update docker-compose.yml

* Update plugin README  (#48)

* Update README and screenshot, remove plop for build info since version is now displayed prominently

* Sign build

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Build actions (#38)

* Drone, github action changes

* Minor version updates

* Update frontend dependencies

* Re-enable unit test

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Revert stylelint version (#52)

* Revert stylelint version

* Build plugin as well as lint

* Build in previous step

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Update screenshot (#53)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* oncall images for docs (#55)

* Update README.md

* Top menu fix

* Fix db encoding

* Add api key docs

* Reverting utf8 fix

* bug fixes

* fix for link for OSS version

* Fixing utf8 and docker compose

* 8080 -> 8000 port for consistency

* makeReq

* Fixing images

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Replace symlink with file for CHANGELOG.MD (#68)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

Co-authored-by: Matias Bordese <mbordese@gmail.com>
Co-authored-by: Matvey Kukuy <Matvey-Kuk@users.noreply.github.com>
Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Co-authored-by: Matvey Kukuy <matvey@amixr.io>
Co-authored-by: Michael Derynck <michael.derynck@grafana.com>
Co-authored-by: Alyssa Wada <101596687+alyssawada@users.noreply.github.com>
Co-authored-by: Yulia Shanyrova <yulia.shanyrova@grafana.com>

Co-authored-by: Ildar Iskhakov <Ildar.iskhakov@grafana.com>
Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Co-authored-by: Matias Bordese <mbordese@gmail.com>
Co-authored-by: Matvey Kukuy <Matvey-Kuk@users.noreply.github.com>
Co-authored-by: Matvey Kukuy <matvey@amixr.io>
Co-authored-by: Alyssa Wada <101596687+alyssawada@users.noreply.github.com>
Co-authored-by: Yulia Shanyrova <yulia.shanyrova@grafana.com>

Co-authored-by: Matias Bordese <mbordese@gmail.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Ildar Iskhakov <ildar.iskhakov@grafana.com>
Co-authored-by: Matvey Kukuy <Matvey-Kuk@users.noreply.github.com>
Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Co-authored-by: Matvey Kukuy <matvey@amixr.io>
Co-authored-by: Alyssa Wada <101596687+alyssawada@users.noreply.github.com>
Co-authored-by: Yulia Shanyrova <yulia.shanyrova@grafana.com>
2022-06-14 09:54:41 -06:00
Michael Derynck
846b898bb9
Merge dev to main (#69)
* Log (failed) attempt to notify a user with viewer role

* Remove https:// prefix from BASE_URL docker env var

* Fix cloud heartbeat name

* Polishing telegram

* Update docker-compose.yml

* Update plugin README  (#48)

* Update README and screenshot, remove plop for build info since version is now displayed prominently

* Sign build

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Build actions (#38)

* Drone, github action changes

* Minor version updates

* Update frontend dependencies

* Re-enable unit test

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Revert stylelint version (#52)

* Revert stylelint version

* Build plugin as well as lint

* Build in previous step

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Update screenshot (#53)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* oncall images for docs (#55)

* Update README.md

* Top menu fix

* Fix db encoding

* Add api key docs

* Reverting utf8 fix

* bug fixes

* fix for link for OSS version

* Fixing utf8 and docker compose

* 8080 -> 8000 port for consistency

* makeReq

* Fixing images

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Fixing port

* Replace symlink with file for CHANGELOG.MD (#68)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

Co-authored-by: Matias Bordese <mbordese@gmail.com>
Co-authored-by: Matvey Kukuy <Matvey-Kuk@users.noreply.github.com>
Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Co-authored-by: Matvey Kukuy <matvey@amixr.io>
Co-authored-by: Michael Derynck <michael.derynck@grafana.com>
Co-authored-by: Alyssa Wada <101596687+alyssawada@users.noreply.github.com>
Co-authored-by: Yulia Shanyrova <yulia.shanyrova@grafana.com>
2022-06-14 09:14:45 -06:00
Michael Derynck
66e8cf2cbc
Merge dev to main (#54)
* Log (failed) attempt to notify a user with viewer role

* Remove https:// prefix from BASE_URL docker env var

* Fix cloud heartbeat name

* Polishing telegram

* Update docker-compose.yml

* Update plugin README  (#48)

* Update README and screenshot, remove plop for build info since version is now displayed prominently

* Sign build

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Build actions (#38)

* Drone, github action changes

* Minor version updates

* Update frontend dependencies

* Re-enable unit test

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Revert stylelint version (#52)

* Revert stylelint version

* Build plugin as well as lint

* Build in previous step

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

* Update screenshot (#53)

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>

Co-authored-by: Matias Bordese <mbordese@gmail.com>
Co-authored-by: Matvey Kukuy <Matvey-Kuk@users.noreply.github.com>
Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Co-authored-by: Matvey Kukuy <matvey@amixr.io>
Co-authored-by: Michael Derynck <michael.derynck@grafana.com>
2022-06-13 16:39:58 -06:00
Ildar Iskhakov
6a2e2acfcb Fix migration 2022-06-13 16:29:39 +03:00
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
Matias Bordese
c0708902d2 Remove unused messaging backends feature flag 2022-06-10 11:09:05 -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