Commit graph

286 commits

Author SHA1 Message Date
Ildar Iskhakov
c19cf8093d
Merge pull request #125 from grafana/dev
Merge dev to main
2022-06-21 17:30:05 +03:00
Matvey Kukuy
0b1b7df946
Merge pull request #124 from grafana/jdb/2022-06-warn-on-no-commit
Allow workflow to silently succeed if nothing is to be committed
2022-06-21 16:53:55 +03:00
Ildar Iskhakov
532c96c35f
Merge pull request #121 from grafana/iskhakov/helm-chart-fixes
Release helm chart to grafana/helm-charts
2022-06-21 16:50:41 +03:00
Ildar Iskhakov
622bc4eb06 Edit envs and remove tests 2022-06-21 16:13:29 +03:00
Jack Baldry
8783a3aa6e
Allow workflow to silently succeed if nothing is to be committed
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2022-06-21 13:46:56 +01:00
Ildar Iskhakov
bcf9247c59 Merge branch 'dev' into iskhakov/helm-chart-fixes 2022-06-21 15:24:28 +03:00
Ildar Iskhakov
26395011aa Remove trailing slash 2022-06-21 15:03:42 +03:00
Ildar Iskhakov
d872a0e939 Add helm tests 2022-06-21 15:01:46 +03:00
Yulya Artyukhina
2e812293c9
Merge pull request #120 from grafana/outgiong-webhook-public-api
Rename field `webhook` to `url` for outgoing webhook public api endpoint
2022-06-21 13:29:01 +03:00
Ildar Iskhakov
9195a60337
Merge pull request #99 from xom4ek/patch-1
Fix externalRedis for correct template
2022-06-21 13:28:42 +03:00
Ildar Iskhakov
1fc68ec871 Release helm chart from grafana/oncall to grafana/helm-charts using common workflow 2022-06-21 13:13:42 +03:00
Ildar Iskhakov
c022f54419
Merge pull request #101 from adityacs/dev
fix(helm): fix password key in external redis secret
2022-06-21 13:02:32 +03:00
Ildar Iskhakov
0ea860ee5a
Merge pull request #111 from achaussier/dev
fix: fix ingress-nginx dependency management in values.yaml
2022-06-21 13:00:34 +03:00
Julia
a4d9bc99a8 Rename field webhook to url for outgoing webhook public api endpoint, update tests 2022-06-21 12:53:22 +03:00
Michael Derynck
ce982ae1c2
Tweak docker-compose (#104)
* Remove env var causing celery container to exit, put containers in their own network

* Remove unnecessary network, remove version since we are mixing, make DB and redis ports internal

* Restore property for CELERY_WORKER_SHUTDOWN_INVERVAL since restart policy added
2022-06-20 09:29:37 -06:00
Alexandre Chaussier
c307bc56ce fix: fix ingress-nginx dependency management in values.yaml 2022-06-18 15:40:58 +02:00
Michael Derynck
da98fa3804
Merge pull request #108 from grafana/dev
Merge dev to main
2022-06-17 10:31:13 -06:00
Michael Derynck
856c6d5302
Update changelog for v1.0.2 (#107) 2022-06-17 10:23:38 -06:00
Yulya Artyukhina
08f0d99572
Merge pull request #106 from grafana/update-outgoing-webhooks-public-endpoint
Update public api endpoint for outgoing webhooks
2022-06-17 17:51:30 +03:00
Julia
43bc8c2fe5 Add tests for outgoing webhooks public api endpoint 2022-06-17 15:41:46 +03:00
Julia
f04f4eaa3f Update public endpoint for outgoing webhooks
- Add abilities to create, update and delete outgoing webhooks by public api endpoint
2022-06-17 15:35:53 +03:00
Ildar Iskhakov
23def92763
Merge pull request #105 from grafana/ildar/fix-docker-compose
Add restart always policy to the services
2022-06-17 14:18:51 +03:00
Ildar Iskhakov
ca9f907f86 Add restart always policy to the services 2022-06-17 14:08:09 +03:00
Yulya Artyukhina
b936e728a9
Merge pull request #103 from grafana/alerting-integration-fix
Quick fix for grafana alerting integration
2022-06-17 12:02:26 +03:00
Julia
49116519b5 lint fix 2022-06-16 17:30:34 +03:00
Julia
d7492bb943 Fix creation contact points for grafana alerting integration 2022-06-16 17:16:31 +03:00
Aditya C S
948ed5ff6c
fix(helm): fix password key in external redis secret 2022-06-16 13:36:42 +05:30
Aleksey
e646293885
Fix externalRedis for correct template
`externalRedis` in https://github.com/grafana/oncall/blob/dev/helm/oncall/templates/_env.tpl#L141 but here `external_redis`
2022-06-16 11:39:13 +04:00
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
3db90db701
Merge pull request #95 from grafana/dev
Merge dev to main
2022-06-15 19:30:42 +03:00
Ildar Iskhakov
a3ee9929b8
Merge pull request #94 from grafana/iskhakov-patch-1
Remove too high connections numbers from uwsgi.ini
2022-06-15 19:20:05 +03:00
Ildar Iskhakov
471d29d50d
Update uwsgi.ini 2022-06-15 19:13:50 +03:00
Matias Bordese
4554fcadcd
Merge pull request #93 from matiasb/90-missing-oauth-slack-settings-mapping
Add missing slack settings to live settings mapping
2022-06-15 11:54:47 -03:00
Matias Bordese
3a69ddcc70 Add missing slack settings to live settings mapping 2022-06-15 11:39:12 -03:00
André Bauer
faaa9988fc
fix link to documentation (#92) 2022-06-15 17:24:24 +03:00
Jack Baldry
28033a46a5
Merge pull request #91 from grafana/jdb/2022-06-add-pr-check-for-docs-links
Add CI test to ensure that broken docs links are not merged to dev or main
2022-06-15 15:05:19 +01:00
Jack Baldry
365af4d545
Add CI test to ensure that broken docs links are not merged to dev or main
This is the same workflow that gates the publishing of docs to the
website in the publish-technical-documentation-*.yml workflows.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2022-06-15 14:51:45 +01:00
Matvey Kukuy
e7fbb78be1
Merge pull request #89 from grafana/fix-am-telegram-template
Fix Telegram message template for AlertManager
2022-06-15 16:29:12 +03:00
Vadim Stepanov
0a8649fa0e Fix Telegram message template for AlertManager 2022-06-15 13:52:25 +03:00
Matvey Kukuy
e0ff1e29ad
Update README.md 2022-06-15 12:24:44 +03:00
Matvey Kukuy
43c4cc1ab4 Merge branch 'main' into dev 2022-06-15 12:10:51 +03:00
Matvey Kukuy
46f95aa721
Merge pull request #87 from natebc/patch-1
fix 404 on link to helm chart
2022-06-15 12:09:32 +03:00
Nate Childers
a865914dca
Update open-source.md
not sure if this should link to dev or main branch but the original url here was a 404
2022-06-15 05:07:26 -04:00
Michael Derynck
dd0e4bf3cd
Update README.md (#81) 2022-06-14 14:40:57 -06:00
Ildar Iskhakov
339beb4eb7
Merge pull request #79 from grafana/dev
Merge dev to main
2022-06-14 21:14:10 +03:00
Michael Derynck
2fc8aa1ce0
Update README.md (#78) 2022-06-14 11:58:02 -06: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
Matvey Kukuy
b5d6d025a9
Update README.md 2022-06-14 19:55:33 +03:00
Matvey Kukuy
86605642e2
Update README.md 2022-06-14 19:53:35 +03:00