Commit graph

1394 commits

Author SHA1 Message Date
Innokentii Konstantinov
a227bc6f3e
Merge pull request #862 from grafana/fix_404_create_contact_points
Handle 404 for get_alerting_config
2022-11-18 17:10:27 +08:00
Innokentii Konstantinov
0816813237 Handle 404 for get_alerting_config 2022-11-18 17:07:39 +08:00
Innokentii Konstantinov
0b645b2835 Update changelog 2022-11-16 19:11:13 +08:00
Innokentii Konstantinov
f5fd3dd76b Fixes to clean_slack_channel_leftovers 2022-11-16 18:23:49 +08:00
Rares Mardare
83f281ca37
Rares/grafana9.3 navbar latest (#758)
* new nav changes in progress

* navbar changes

* navbar

* working navbar

* got rid of deprecated usages from @grafana/*

* removed duplicated headers

* navbar changes

* path fix for links

* old navbar support through navbarRootFallback

* alignment

* minor changes

* breadcrumb fix

* header

* tabs and header for legacy navigation

* nav fix

* more fixes :)

* refactored sass rule

* docker file

* docker source image

* eslint added ^plugin to settings

* docker host

* fix

* test fix

* bring back team selector

* cleanup

* linter fix

* navbar chatops changes

* navbar

* added component to display header in legacy navbar

* fixed headings

* linter changes

* default route

* navbar class fallback

* permission checks for viewing cloud/live settings

* fixed styling for legacy

* linter + docker

* legacy handling of hideFromTabs

* init tabs logic

* renamed to isTopNavbar

* refactor

* some refactoring

* fix deprecated query usage

* temporarily disable test for webhooks

* reverted docker file to original content
2022-11-16 17:56:54 +08:00
Innokentii Konstantinov
f9a9c1d978
Cleanup on deletion/archivation of slack channel (#822)
* Cleanup on deletion/archivation of slack channel

* Bulk update of organizations, filter channel filters by org

* Optimize org bulk update
2022-11-16 17:56:05 +08:00
Innokentii Konstantinov
043700d228
Add additional validation for route's position field (#831)
* Add test for out of range route's order value

* Add additional validation for route's position when manual ordering is applied

* Remove print()

* Remove print
2022-11-16 17:55:53 +08:00
Jack Jackson
0bb1a792ea Add documentation for issue make when CDPATH is set unusually
Note - you may be wondering "how could your system possibly function if
`.` is not part of `CDPATH`? Testing suggests that behaviour is
inconsistent between shells - `sh` will entirely ignore the current
directory if `.` is absent, but `zsh` will still attempt to search the
current directory even if `.` is not in `CDPATH`
2022-11-14 08:07:43 +01:00
Jack Jackson
8cdc1a76e3 Typo-fix 2022-11-14 08:06:17 +01:00
Jack Jackson
8b6bd3a32d Correct typos regarding COMPOSE_PROFILES
Proof:

```
$ grep 'COMPOSE' dev/.env.dev
COMPOSE_PROFILE=overriden_value_1
COMPOSE_PROFILES=overriden_value_2
$ make start
COMPOSE_PROFILES=overriden_value_2 [...]
```
2022-11-14 08:05:32 +01:00
Vadim Stepanov
41f8d4afb1
PD migrator: add support for email notifications (#839) 2022-11-11 13:40:43 +00:00
Michael Derynck
5143393e4b
Merge pull request #820 from grafana/mderynck/twilio-api-key-permission
Twilio add simple check if using API key instead of AUTH token
2022-11-10 08:23:32 -07:00
Joey Orlando
c7c3aa823c
local dev setup - fixes for some minor issues (#821)
* use docker compose instead of docker-compose

the former is the newer version, latter is being deprecated

* default to using latest version of grafana, not main

main is "bleeding-edge" grafana, use the more stable "latest" tag

* support requirements-enterprise.txt for both docker/non-docker setups

* backend-bootstrap make command should install enterprise
requirements if the file is there

* only mount the sqlite db file in docker-compose if using sqlite as the DB
2022-11-10 16:04:30 +01:00
Michael Derynck
d15a507763 Add simple check if using API key instead of AUTH token 2022-11-09 21:52:42 -07:00
Matias Bordese
f3ac66b8bd
Merge branch 'main' into dev 2022-11-09 15:08:11 -03:00
Matias Bordese
4dc8adee1f
Update CHANGELOG.md 2022-11-09 15:05:55 -03:00
Matias Bordese
5bf6696b0b
Merge pull request #818 from grafana/matiasb/sign-drone-changes
Update .drone.yml signature
2022-11-09 15:00:31 -03:00
Matias Bordese
1802eb711b Update .drone.yml signature 2022-11-09 14:53:35 -03:00
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
53bfffefc8
Fix helm values.yaml, bump helm version (#801) 2022-11-08 18:03:47 +08: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