Commit graph

1589 commits

Author SHA1 Message Date
Joey Orlando
12751fa510
Revert "testing branch merge strategy" 2023-01-05 12:46:55 +01:00
Joey Orlando
5d82432b78
Merge pull request #1086 from grafana/jorlando/branch-merge-test
testing branch merge strategy
2023-01-05 12:46:48 +01:00
Joey Orlando
58a9d2ac52
testing 2023-01-05 12:45:08 +01:00
Innokentii Konstantinov
bf9e5c0ad7 Update Changelog 2023-01-05 13:39:23 +08:00
Innokentii Konstantinov
8abbcee050
Org soft-delete (#1073)
# What this PR does
It introduces soft-delete of organization, since grafana stacks are
soft-deleted too. Also, we had a problem with deleting orgs with large
amounts of alerts, so soft-deletion will fix this problem. I think, that
problem of cleaning alerts of deleted orgs should be solved as a part of
alert retention
2023-01-05 12:42:55 +08:00
Vadim Stepanov
0d4701bd81
Change wording from "incident" to "alert group" in the Telegram app (#1052)
# What this PR does
Makes Telegram integration consistent with the rest of the system so it
uses the word "alert group" instead of "incident" when referring to
alert groups.

## Checklist

- [x] Tests updated
- [ ] Documentation added (N/A)
- [x] `CHANGELOG.md` updated
2023-01-04 17:44:01 +00:00
Vadim Stepanov
9503a77579
Fix "existing schedule will be deleted" message for PD migrator (#1076)
Resolves https://github.com/grafana/oncall/issues/1066
2023-01-04 17:36:15 +00:00
Vadim Stepanov
7a1f176cb5
Schedule score backend (#338)
This PR adds an endpoint returning a schedule quality score, overloaded
users and comments on the existing issues (e.g. balance issues or gaps).

## Limitations
- Since working hours editor is not implemented yet, there are only two
scores taken into account: balance score and a score representing the
ratio of time when someone is on-call to the whole time period.
- Time period is now set to be constant (90 days from today), so **in
some cases the results will be inaccurate** (when rotations don't align
with the time period)
- It only takes primary rotations into account (overrides are ignored)

## Usage
`GET /api/internal/v1/schedules/<pk>/quality?date=<TOMORROW_DATE>`

Note that `date` should be tomorrow date, because we can only be sure
about changing tomorrow's shifts (some of the shifts for current day
could be "deleted" but still show up in the UI).

## Example response
```json
{
  "total_score": 90,
  "comments": ["Schedule has no gaps", "Schedule is well-balanced, but still can be improved"],
  "overloaded_users": ["USSZ5WRH2CUA9", "U74XJZSSQGBIH"]
}
```

Issue: #118
2023-01-04 16:49:58 +00:00
Ildar Iskhakov
34ba3e7574
Merge pull request #1075 from grafana/iskhakov/remove-local-uwsgi-tracing
Remove local uwsgi instrumentation and local development tempo and agent
2023-01-04 22:47:26 +08:00
Ildar Iskhakov
15256bc4cf Remove local uwsgi instrumentation and local development tempo and agent 2023-01-04 22:25:17 +08:00
Ildar Iskhakov
8e61d0fde0
Merge pull request #1074 from grafana/iskhakov/fix-local-env
Add uwsgidecorators to requirements.txt
2023-01-04 20:47:34 +08:00
Ildar Iskhakov
dd6e716ea4 Add uwsgidecorators to requirements.txt 2023-01-04 20:46:52 +08:00
dependabot[bot]
0d7924ea05
Bump json5 from 1.0.1 to 1.0.2 in /grafana-plugin (#1071) 2023-01-04 09:35:37 +01:00
Ildar Iskhakov
6406381a14
Merge pull request #1019 from grafana/iskhakov/add-tracing
Add tracing support
2023-01-04 11:15:34 +08:00
Ildar Iskhakov
846497ddc7 Move env vars to docker-compose-dev.yml and clean up 2023-01-04 10:49:42 +08:00
Ildar Iskhakov
2b0e4e1d14 Merge branch 'dev' into iskhakov/add-tracing 2023-01-04 10:46:49 +08:00
Ildar Iskhakov
01f3e19e02
Update CHANGELOG.md 2023-01-04 10:11:33 +08:00
Ildar Iskhakov
0e54a9f253
Update CHANGELOG.md 2023-01-04 10:02:29 +08:00
Ildar Iskhakov
89144692d3
Update CHANGELOG.md 2023-01-04 09:09:51 +08:00
Ildar Iskhakov
47687ff88b
Merge pull request #1013 from grafana/rares/grafana-faro
Grafana Faro integration
2023-01-04 08:58:50 +08:00
Ildar Iskhakov
3583c5ea49
Update faro.ts 2023-01-04 08:57:22 +08:00
Michael Derynck
cc31af20dc
Update CHANGELOG.md 2023-01-03 14:07:32 -07:00
Michael Derynck
7c26eb559b
Improve handling of template exceptions during group data creation (#1068)
# What this PR does
With the addition of tighter controls on jinja templates handle
exceptions while rendering group data as follows:
- Title will cache error message as title and display to user and the
error will be logged
- Group distinction will be left as None and the error will be logged
- Is resolve signal will be treated as False and the error will be
logged
- Is acknowledge signal will be treated as False and the error will be
logged

## Which issue(s) this PR fixes
https://github.com/grafana/oncall-private/issues/1542
2023-01-03 12:30:59 -07:00
Vadim Stepanov
cd770e85ea
Catch DoesNotExist in post_slack_rate_limit_message (#1067) 2023-01-03 17:44:56 +00:00
Ildar Iskhakov
da51edefcc
Update CHANGELOG.md 2023-01-03 21:50:53 +08:00
Ildar Iskhakov
4a32b21c46
Update CHANGELOG.md 2023-01-03 21:09:00 +08:00
Ildar Iskhakov
d778710469
Update CHANGELOG.md 2023-01-03 21:07:36 +08:00
Joey Orlando
25998103cc
swap psycopg2-binary to psycopg2 in requirements.txt (#1062)
Fixes issue when running OnCall locally, on an M1 Mac, and using
PostgreSQL as the database. (ie. `COMPOSE_PROFILES=postgres...`).
Currently getting:
```bash
django.db.utils.OperationalError: SCRAM authentication requires libpq version 10 or above
```

I also tried simply adding `libpq-dev` to the `Dockerfile` but this
change alone does not solve the issue. See
[here](https://github.com/MobSF/Mobile-Security-Framework-MobSF/issues/1898)
for a similar reported issue on GitHub.

**Root Cause**
This issue is caused because `psycopg2-binary` 2.9.3 [doesn't
provide](https://pypi.org/project/psycopg2-binary/2.9.3/#files) binary
wheels for MacOS arm64; binary wheels for MacOS are only provided for
Intel x86 64 bits
([reference](https://stackoverflow.com/a/71653850/3902555)).
2023-01-03 13:47:03 +01:00
Matias Bordese
05524ab698
Merge pull request #1059 from grafana/matiasb/truncate-slack-title-block
Truncate slack alert group title block below max size
2023-01-03 08:50:57 -03:00
Matias Bordese
0a3c96d3c3
Merge pull request #1058 from grafana/matias/fix-schedule-no-start-byday
Handle no start date when calculating by day ical shift events
2023-01-03 08:50:27 -03:00
Ildar Iskhakov
100a18ab1c
Update CHANGELOG.md 2023-01-03 19:46:12 +08:00
Maxim
4f5c2503e1 use hardcoded faro creds instead of env defined 2023-01-03 12:30:53 +03:00
Joey Orlando
78c10cf0ca
bump crptography version (#1061)
## Which issue(s) this PR fixes
This change fixes the following issue:
```bash
Traceback (most recent call last):
  File "/etc/app/manage.py", line 15, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/local/lib/python3.9/site-packages/django/core/management/__init__.py", line 419, in execute_from_command_line
    utility.execute()
  File "/usr/local/lib/python3.9/site-packages/django/core/management/__init__.py", line 413, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/local/lib/python3.9/site-packages/django/core/management/base.py", line 354, in run_from_argv
    self.execute(*args, **cmd_options)
  File "/usr/local/lib/python3.9/site-packages/django/core/management/base.py", line 398, in execute
    output = self.handle(*args, **options)
  File "/usr/local/lib/python3.9/site-packages/django/core/management/base.py", line 89, in wrapped
    res = handle_func(*args, **kwargs)
  File "/usr/local/lib/python3.9/site-packages/django/core/management/commands/migrate.py", line 75, in handle
    self.check(databases=[database])
  File "/usr/local/lib/python3.9/site-packages/django/core/management/base.py", line 419, in check
    all_issues = checks.run_checks(
  File "/usr/local/lib/python3.9/site-packages/django/core/checks/registry.py", line 76, in run_checks
    new_errors = check(app_configs=app_configs, databases=databases)
  File "/usr/local/lib/python3.9/site-packages/django/core/checks/urls.py", line 13, in check_url_config
    return check_resolver(resolver)
  File "/usr/local/lib/python3.9/site-packages/django/core/checks/urls.py", line 23, in check_resolver
    return check_method()
  File "/usr/local/lib/python3.9/site-packages/django/urls/resolvers.py", line 416, in check
    for pattern in self.url_patterns:
  File "/usr/local/lib/python3.9/site-packages/django/utils/functional.py", line 48, in __get__
    res = instance.__dict__[self.name] = self.func(instance)
  File "/usr/local/lib/python3.9/site-packages/django/urls/resolvers.py", line 602, in url_patterns
    patterns = getattr(self.urlconf_module, "urlpatterns", self.urlconf_module)
  File "/usr/local/lib/python3.9/site-packages/django/utils/functional.py", line 48, in __get__
    res = instance.__dict__[self.name] = self.func(instance)
  File "/usr/local/lib/python3.9/site-packages/django/urls/resolvers.py", line 595, in urlconf_module
    return import_module(self.urlconf_name)
  File "/usr/local/lib/python3.9/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1030, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1007, in _find_and_load
  File "<frozen importlib._bootstrap>", line 986, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 680, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 850, in exec_module
  File "<frozen importlib._bootstrap>", line 228, in _call_with_frames_removed
  File "/etc/app/extensions/engine_enterprise/engine_enterprise/engine_enterprise_urls.py", line 2, in <module>
    from engine.urls import urlpatterns
  File "/etc/app/engine/urls.py", line 36, in <module>
    path("integrations/v1/", include("apps.integrations.urls", namespace="integrations")),
  File "/usr/local/lib/python3.9/site-packages/django/urls/conf.py", line 34, in include
    urlconf_module = import_module(urlconf_module)
  File "/usr/local/lib/python3.9/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "/etc/app/apps/integrations/urls.py", line 5, in <module>
    from .views import (
  File "/etc/app/apps/integrations/views.py", line 14, in <module>
    from django_sns_view.views import SNSEndpoint
  File "/usr/local/lib/python3.9/site-packages/django_sns_view/views.py", line 17, in <module>
    from django_sns_view.utils import confirm_subscription, verify_notification
  File "/usr/local/lib/python3.9/site-packages/django_sns_view/utils.py", line 6, in <module>
    import pem
  File "/usr/local/lib/python3.9/site-packages/pem/__init__.py", line 26, in <module>
    from . import twisted
  File "/usr/local/lib/python3.9/site-packages/pem/twisted.py", line 9, in <module>
    from OpenSSL.SSL import FILETYPE_PEM
  File "/usr/local/lib/python3.9/site-packages/OpenSSL/__init__.py", line 8, in <module>
    from OpenSSL import crypto, SSL
  File "/usr/local/lib/python3.9/site-packages/OpenSSL/crypto.py", line 3279, in <module>
    _lib.OpenSSL_add_all_algorithms()
AttributeError: module 'lib' has no attribute 'OpenSSL_add_all_algorithms'
```
2023-01-03 10:08:00 +01:00
Ildar Iskhakov
1ff0a7da99
1.1.5.5 -> dev (#1060)
# What this PR does

## Which issue(s) this PR fixes

## Checklist

- [ ] Tests updated
- [ ] Documentation added
- [ ] `CHANGELOG.md` updated

Co-authored-by: Vadim Stepanov <vadimkerr@gmail.com>
Co-authored-by: Julia <ferril.darkdiver@gmail.com>
Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Co-authored-by: Matias Bordese <mbordese@gmail.com>
2023-01-03 11:57:16 +08:00
Innokentii Konstantinov
5e297847ae Speedup alert group search 2023-01-03 11:04:16 +08:00
Matias Bordese
374f32f489 Handle no start date when calculating by day ical shift events 2023-01-02 11:53:49 -03:00
Matias Bordese
75aaeef3f2 Truncate slack alert group title block below max size 2023-01-02 10:07:53 -03:00
Vadim Stepanov
9ebf20c488
Make user matching by email case-insensitive for PD migrator (#1056)
https://github.com/grafana/oncall/issues/1025
2022-12-30 16:11:35 +00:00
Vadim Stepanov
1b67a8ec68
Add PD migrator lint & test steps to CI (#1053)
# What this PR does

- Add PD migrator related hooks to `.pre-commit-config.yaml`
- Add Github Actions step for running PD migrator tests
2022-12-30 16:03:39 +00:00
Ildar Iskhakov
282e58db7b
Don't render logs for too big telegram dm (#1051)
# What this PR does

## Which issue(s) this PR fixes

## Checklist

- [ ] Tests updated
- [ ] Documentation added
- [ ] `CHANGELOG.md` updated
2022-12-29 13:22:15 +00:00
Joey Orlando
d1a43bdf1b
specify Firebase GCP project id (#1042)
Modifies the Firebase app initialization to explicitly specify the GCP
project ID where the Firebase app is. Previously it would use the
project associated with the service account being used.
2022-12-22 21:44:53 +01:00
teodosii
3315e9dab1 just promises?
dev dependency


type reuse from sdk package
2022-12-22 15:06:55 +02:00
teodosii
f935803354 review
reordered dependencies
2022-12-22 13:38:47 +02:00
teodosii
89f6f74490 enforce hyphen naming for app 2022-12-22 00:34:25 +02:00
teodosii
62d0f019e4 Merge branch 'dev' into rares/grafana-faro 2022-12-22 00:28:57 +02:00
teodosii
d92ab4bca6 make api key optional to follow appo11y config convention 2022-12-22 00:03:09 +02:00
Joey Orlando
e1b798d586
add curl and bash to oncall engine docker image (#1034)
Currently unable to exec into a k8s pod. I believe this is because
`bash` is missing from the Docker image after switching from alpine to
debian buster. Debugging this by adding in `bash`.
2022-12-21 18:23:16 +01:00
teodosii
07a7941c6c Merge branch 'dev' into rares/grafana-faro 2022-12-21 11:32:53 +02:00
teodosii
6deede6385 Concat environment next to 'Grafana OnCall' for differentiating environments 2022-12-21 11:32:49 +02:00
Ieva
e1b9a75ce7
RBAC: update RBAC permissions scopes for plugins.app:access action (#1028)
Change RBAC permission scope to `plugins🆔grafana-oncall-app` from
`plugins.app🆔grafana-oncall-app` for permissions with
`plugins.app:access` action. This is needed because [Grafana is
expecting](https://github.com/grafana/grafana/blob/main/pkg/services/accesscontrol/pluginutils/utils.go#L20-L21)
`plugins:` not `plugins.app` prefix for permissions with
`plugins.app:access` action.
2022-12-20 18:15:18 +01:00