Merge pull request #431 from grafana/dev

Merge dev to main

.drone.yml

@@ -263,6 +263,69 @@ trigger:
   event:
     - promote
 
+---
+kind: pipeline
+type: docker
+name: OSS Release (arm64)
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+  - name: Check Promote
+    image: alpine
+    commands:
+      - if [ -z "$DRONE_DEPLOY_TO" ]; then echo "Missing DRONE_DEPLOY_TO (Target)"; exit 1; fi
+      - if [ -z "$DRONE_TAG" ]; then echo "Missing DRONE_TAG"; exit 1; fi
+      - echo Promoting $DRONE_TAG to $DRONE_DEPLOY_TO
+
+  - name: Image Tag
+    image: alpine
+    commands:
+      - apk add --no-cache bash git sed
+      - git fetch origin --tags
+      - chmod +x ./tools/image-tag.sh
+      - echo $(./tools/image-tag.sh)
+      - echo $(./tools/image-tag.sh) > .tags
+      - if [ -z "$DRONE_TAG" ]; then echo "No tag, not modifying version"; else sed "0,/VERSION.*/ s/VERSION.*/VERSION = \"${DRONE_TAG}\"/g" engine/settings/base.py > engine/settings/base.temp && mv engine/settings/base.temp engine/settings/base.py; fi
+      - cat engine/settings/base.py | grep VERSION | head -1
+    depends_on:
+      - Check Promote
+    when:
+      event:
+        - promote
+      target:
+        - oss
+      ref:
+        - refs/tags/v*.*.*
+
+  - name: Build and Push Engine Docker Image Backend to Dockerhub
+    image: plugins/docker
+    settings:
+      repo: grafana/oncall
+      dockerfile: engine/Dockerfile
+      context: engine/
+      password:
+        from_secret: docker_password
+      username:
+        from_secret: docker_username
+    depends_on:
+      - Image Tag
+
+  - name: Unrecognized Promote Target
+    image: alpine
+    commands:
+      - echo $DRONE_DEPLOY_TO is not a recognized promote target!
+      - exit 1
+    when:
+      target:
+        exclude:
+          - oss
+
+trigger:
+  event:
+    - promote
+
 ---
 # Secret for pulling docker images.
 kind: secret
@@ -334,6 +397,6 @@ kind: secret
 name: drone_token
 ---
 kind: signature
-hmac: a74dd831a3d0a87b8fc1db45699a6a834ea769da9f437c55979ae665948c3b3f
+hmac: 484ec4337e39172f554faafaa93b67ceb9397d2c668ab2eb6f38176e94402aaa
 
 ...

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## v1.0.27 (2022-08-30)
+- Bug fixes
+
 ## v1.0.26 (2022-08-26)
 - Insight log's format fixes
 - Remove UserNotificationPolicy auto-recreating

engine/apps/api/views/public_api_tokens.py

@@ -31,7 +31,7 @@ class PublicApiTokenView(
 
     def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
-        write_resource_insight_log(instance=instance, author=instance.author, event=EntityEvent.DELETED)
+        write_resource_insight_log(instance=instance, author=request.user, event=EntityEvent.DELETED)
         self.perform_destroy(instance)
         return Response(status=status.HTTP_204_NO_CONTENT)
 

engine/apps/schedules/tests/test_custom_on_call_shift.py

@@ -585,7 +585,8 @@ def test_rolling_users_with_diff_start_and_rotation_start_weekly_by_day(
     schedule = make_schedule(organization, schedule_class=OnCallScheduleWeb)
     now = timezone.now().replace(hour=0, minute=0, second=0, microsecond=0)
     today_weekday = now.weekday()
-    next_week_monday = now + timezone.timedelta(days=(0 - today_weekday) % 7)
+    delta_days = (0 - today_weekday) % 7 + (7 if today_weekday == 0 else 0)
+    next_week_monday = now + timezone.timedelta(days=delta_days)
     # SAT, SUN
     weekdays = [5, 6]
     by_day = [CustomOnCallShift.ICAL_WEEKDAY_MAP[day] for day in weekdays]

grafana-plugin/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## v1.0.27 (2022-08-30)
+- Bug fixes
+
+## v1.0.26 (2022-08-26)
+- Insight log's format fixes
+- Remove UserNotificationPolicy auto-recreating
+
+## v1.0.25 (2022-08-24)
+- Bug fixes
+
+## v1.0.24 (2022-08-24)
+- Insight logs
+- Default DATA_UPLOAD_MAX_MEMORY_SIZE to 1mb
+
+## v1.0.23 (2022-08-23)
+- Bug fixes
+
 ## v1.0.22 (2022-08-16)
 - Make STATIC_URL configurable from environment variable