Commit graph

5007 commits

Author SHA1 Message Date
Innokentii Konstantinov
285a55230c Fix cloud heartbeat name 2022-06-13 20:42:05 +04:00
Matvey Kukuy
df1516329d
Merge pull request #44 from grafana/remove-base-url-https-prefix
Remove https:// prefix from BASE_URL docker env var
2022-06-13 18:24:44 +03:00
Matias Bordese
29d8369274 Remove https:// prefix from BASE_URL docker env var 2022-06-13 11:44:22 -03:00
Innokentii Konstantinov
cc1fc53478
Merge pull request #42 from grafana/dev
Merge dev to main
2022-06-13 18:07:58 +04:00
Innokentii Konstantinov
f2ee00f288 Fix MS teams user tab 2022-06-13 17:42:55 +04: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
464fbcae9f Merge remote-tracking branch 'origin/dev' into dev 2022-06-13 16:02:07 +03:00
Matvey Kukuy
502d25101c Commenting out docs publishing 2022-06-13 16:01:59 +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
Jack Baldry
76e0aaa818
s/mimir/oncall/
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2022-06-13 13:55:17 +01: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
f6b7c0a61a
Merge pull request #41 from grafana/dev
Merge dev to main
2022-06-13 14:57:01 +03:00
Ildar Iskhakov
671723b9c7 Merge branch 'dev' into helm-chart-installation 2022-06-13 14:53:05 +03: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
Matvey Kukuy
c6ba0d1073 Merge branch 'dev' into docs-refresh-before-oss 2022-06-13 12:39:19 +03:00
Ildar Iskhakov
c2c503788b
Merge pull request #37 from grafana/refactor-integrations
Refactor integrations
2022-06-13 12:15:58 +03:00
Matvey Kukuy
eb87a57b43 Open Source page 2022-06-13 12:11:38 +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
Ildar Iskhakov
fa18322ce6 Add helm chaart installation 2022-06-13 11:24:47 +03:00
Matvey Kukuy
e9b9d50a79
Update README.md 2022-06-13 09:59:22 +03:00
Matvey Kukuy
2e432b4cb7 Merge remote-tracking branch 'origin/dev' into dev 2022-06-10 22:58:53 +03:00
Matvey Kukuy
78f7d960d6 Polishing... 2022-06-10 22:58:46 +03:00
Matvey Kukuy
979862354a
Merge pull request #30 from grafana/plugin-configuration-polish
Plugin configuration polish
2022-06-10 21:50:58 +03:00
Yulia Shanyrova
1070fc0bd3 Grafana URL saved at localstorage, confirmation window deleted 2022-06-10 20:05:36 +02: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
Yulia Shanyrova
a24871c85b Merge branch 'dev' into plugin-configuration-polish 2022-06-10 14:02:27 +02:00
Jack Baldry
2e35f5300a
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>
2022-06-10 12:22:47 +01:00
Jack Baldry
b9be621515
Remove old publishing workflow
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2022-06-10 12:13:16 +01:00
Matvey Kukuy
e7bbbfac84 docker-compose polish 2022-06-10 00:18:17 +03:00
Matvey Kukuy
d201550989
Update README.md 2022-06-10 00:11:14 +03:00
Matvey Kukuy
ac3a7f4df0 Texts polishing for configuration page 2022-06-10 00:05:28 +03:00
Matvey Kukuy
51f1e2f5aa Hobby polish 2022-06-09 23:55:57 +03:00
Ildar Iskhakov
7b385a8790 Refactor integrations 2022-06-09 23:27:40 +03:00
Matvey Kukuy
51eda4786b Hobby polish 2022-06-09 23:24:47 +03:00
Matvey Kukuy
05fc5cff33 Merge remote-tracking branch 'origin/dev' into dev 2022-06-09 23:05:39 +03:00
Matvey Kukuy
71a473aa97 Readme polish 2022-06-09 23:05:31 +03:00
Michael Derynck
8af7bffa27
Only execute release process on tags that match version pattern (#21)
* Only execute release process on tags that match version pattern

* Sign build

Co-authored-by: Michael Derynck <michael.derynck@grafana.com>
2022-06-09 13:59:56 -06:00
Michael Derynck
24e1f8c3e3
Update DEVELOPER.md 2022-06-09 13:40:00 -06:00
Michael Derynck
4d625ba264
Update DEVELOPER.md 2022-06-09 13:39:11 -06: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
Alyssa Wada
830da9f8f6
Merge pull request #29 from grafana/jdb/2022-06-add-current-aliases-to-all-pages
Convert front matter to YAML and add current aliases to all pages
2022-06-09 10:56:04 -06:00
Matvey Kukuy
52cc1eb734 Flake 2022-06-09 19:52:09 +03:00
Matvey Kukuy
41ece815fb
Merge pull request #35 from grafana/hobby-docker-compose
hobby-docker-compose
2022-06-09 18:00:03 +03:00