Merge pull request #776 from grafana/dev

Release new helm chart version 1.0.9 (v1.0.50)

Author: mderynck

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v1.0.51 (2022-11-05)
+
+- Bug Fixes
+
 ## v1.0.50 (2022-11-03)
 
 - Updates to documentation

Makefile

@@ -11,7 +11,7 @@ PYTEST = $(ENV)/bin/pytest
 DOCKER_FILE ?= docker-compose-developer.yml
 
 define setup_engine_env
-	export `grep -v '^#' .env | xargs -0` && cd engine
+	export `grep -v '^#' .env.dev | xargs -0` && cd engine
 endef
 
 $(ENV):

docs/sources/_index.md

@@ -29,6 +29,4 @@ Grafana OnCall is an open source incident response management tool built to help
 - **Massive scalability:** Grafana OnCall is equipped with a full API and Terraform capabilities. Ready for GitOps and large organization configuration. 
 
 
-> **Note:** You can use [Grafana Cloud](https://grafana.com/products/cloud/?plcmt=nav-products-cta1&cta=cloud) to avoid installing, maintaining, and scaling your own instance of Grafana OnCall. The free forever plan includes 30 Grafana OnCall notification. [Create an account to get started](https://grafana.com/auth/sign-up/create-user?pg=oncall&plcmt=hero-btn-1).
-
 {{< section >}}

docs/sources/alert-behavior/_index.md

@@ -18,3 +18,6 @@ Once Grafana OnCall receives an alert, the following occurs, based on the alert
 - Default or customized alert templates are applied to deliver the most useful alert fields with the most valuable information, in a readable format.
 - Alerts are grouped based on your alert grouping configurations, combining similar or related alerts to reduce alert noise.
 - Alerts automatically resolve if an alert from the monitoring system matches the resolve condition for that alert.
+
+
+{{< section >}}

docs/sources/get-started/_index.md

@@ -26,10 +26,7 @@ These procedures introduce you to initial Grafana OnCall configuration steps, in
 
 ## Before you begin
 
-Grafana OnCall is available for Grafana Cloud as well as Grafana open source users. You must have a Grafana Cloud account or [Open Source Grafana OnCall]({{< relref "../open-source" >}})
-
-For more information, see [Grafana Pricing](https://grafana.com/pricing/) for details.
-
+Grafana OnCall is available for Grafana Cloud as well as Grafana open source users. You must have a Grafana Cloud account or use [Open Source Grafana OnCall]({{< relref "../open-source" >}})
 
 ## Install Open Source Grafana OnCall
 

engine/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-alpine
+FROM python:3.9-alpine3.16
 RUN apk add bash python3-dev build-base linux-headers pcre-dev mariadb-connector-c-dev openssl-dev libffi-dev git
 RUN pip install uwsgi
 

engine/apps/alerts/models/alert_receive_channel.py

@@ -14,7 +14,6 @@
 from django.utils import timezone
 from django.utils.crypto import get_random_string
 from emoji import emojize
-from jinja2 import Template
 
 from apps.alerts.grafana_alerting_sync_manager.grafana_alerting_sync import GrafanaAlertingSyncManager
 from apps.alerts.integration_options_mixin import IntegrationOptionsMixin
@@ -29,6 +28,7 @@
 from common.api_helpers.utils import create_engine_url
 from common.exceptions import TeamCanNotBeChangedError, UnableToSendDemoAlert
 from common.insight_log import EntityEvent, write_resource_insight_log
+from common.jinja_templater import jinja_template_env
 from common.public_primary_keys import generate_public_primary_key, increase_public_primary_key_length
 
 logger = logging.getLogger(__name__)
@@ -360,7 +360,7 @@ def is_demo_alert_enabled(self):
     def description(self):
         if self.integration == AlertReceiveChannel.INTEGRATION_GRAFANA_ALERTING:
             contact_points = self.contact_points.all()
-            rendered_description = Template(self.config.description).render(
+            rendered_description = jinja_template_env.from_string(self.config.description).render(
                 is_finished_alerting_setup=self.is_finished_alerting_setup,
                 grafana_alerting_entities=[
                     {

engine/apps/alerts/models/custom_button.py

@@ -7,9 +7,9 @@
 from django.db import models
 from django.db.models import F
 from django.utils import timezone
-from jinja2 import Template
 from requests.auth import HTTPBasicAuth
 
+from common.jinja_templater import jinja_template_env
 from common.public_primary_keys import generate_public_primary_key, increase_public_primary_key_length
 
 logger = logging.getLogger(__name__)
@@ -103,7 +103,7 @@ def build_post_kwargs(self, alert):
         if self.forward_whole_payload:
             post_kwargs["json"] = alert.raw_request_data
         elif self.data:
-            rendered_data = Template(self.data).render(
+            rendered_data = jinja_template_env.from_string(self.data).render(
                 {
                     "alert_payload": self._escape_alert_payload(alert.raw_request_data),
                     "alert_group_id": alert.group.public_primary_key,

engine/apps/api/serializers/custom_button.py

@@ -2,13 +2,14 @@
 from collections import defaultdict
 
 from django.core.validators import URLValidator, ValidationError
-from jinja2 import Template, TemplateError
+from jinja2 import TemplateError
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
 
 from apps.alerts.models import CustomButton
 from common.api_helpers.custom_fields import TeamPrimaryKeyRelatedField
 from common.api_helpers.utils import CurrentOrganizationDefault, CurrentTeamDefault
+from common.jinja_templater import jinja_template_env
 
 
 class CustomButtonSerializer(serializers.ModelSerializer):
@@ -52,7 +53,7 @@ def validate_data(self, data):
             return None
 
         try:
-            template = Template(data)
+            template = jinja_template_env.from_string(data)
         except TemplateError:
             raise serializers.ValidationError("Data has incorrect template")
 

engine/apps/api/serializers/on_call_shifts.py

@@ -114,8 +114,12 @@ def _validate_frequency(self, frequency, event_type, rolling_users, interval, by
                 raise serializers.ValidationError(
                     {"frequency": ["Cannot set 'frequency' for shifts with type 'override'"]}
                 )
-            if frequency != CustomOnCallShift.FREQUENCY_WEEKLY and by_day:
+            if frequency not in (CustomOnCallShift.FREQUENCY_WEEKLY, CustomOnCallShift.FREQUENCY_DAILY) and by_day:
                 raise serializers.ValidationError({"by_day": ["Cannot set days value for this frequency type"]})
+            if frequency == CustomOnCallShift.FREQUENCY_DAILY and by_day and interval > len(by_day):
+                raise serializers.ValidationError(
+                    {"interval": ["Interval must be less than or equal to the number of selected days"]}
+                )
 
     def _validate_rotation_start(self, shift_start, rotation_start):
         if rotation_start < shift_start: