Merge pull request #819 from grafana/dev

Merge dev to main

.drone.yml

@@ -100,10 +100,15 @@ steps:
 
   - name: Build and Push Engine Docker Image Backend to GCR
     image: plugins/docker
+    environment:
+      # force docker to use buildkit feature, this will skip build stages that aren't required in the final image (ie. dev & dev-enterprise)
+      # https://github.com/docker/cli/issues/1134#issuecomment-406449342
+      DOCKER_BUILDKIT: 1
     settings:
       repo: us.gcr.io/kubernetes-dev/oncall
       dockerfile: engine/Dockerfile
       context: engine/
+      target: prod
       config:
         from_secret: gcr_admin
     depends_on:
@@ -113,10 +118,15 @@ steps:
 
   - name: Build and Push Engine Docker Image Backend to Dockerhub
     image: plugins/docker
+    environment:
+      # force docker to use buildkit feature, this will skip build stages that aren't required in the final image (ie. dev & dev-enterprise)
+      # https://github.com/docker/cli/issues/1134#issuecomment-406449342
+      DOCKER_BUILDKIT: 1
     settings:
       repo: grafana/oncall
       dockerfile: engine/Dockerfile
       context: engine/
+      target: prod
       password:
         from_secret: docker_password
       username:
@@ -146,9 +156,9 @@ services:
 trigger:
   event:
     include:
-    - tag
-    - push
-    - pull_request
+      - tag
+      - push
+      - pull_request
   ref:
     include:
       - refs/heads/main
@@ -196,7 +206,7 @@ steps:
       GRAFANA_API_KEY:
         from_secret: gcom_plugin_publisher_api_key
     commands:
-      - "curl -f -s -H \"Authorization: Bearer $${GRAFANA_API_KEY}\" -d \"download[any][url]=https://storage.googleapis.com/grafana-oncall-app/releases/grafana-oncall-app-${DRONE_TAG}.zip\" -d \"download[any][md5]=$$(curl -sL https://storage.googleapis.com/grafana-oncall-app/releases/grafana-oncall-app-${DRONE_TAG}.zip | md5sum | cut -d' ' -f1)\" -d url=https://github.com/grafana/oncall/grafana-plugin https://grafana.com/api/plugins"
+      - 'curl -f -s -H "Authorization: Bearer $${GRAFANA_API_KEY}" -d "download[any][url]=https://storage.googleapis.com/grafana-oncall-app/releases/grafana-oncall-app-${DRONE_TAG}.zip" -d "download[any][md5]=$$(curl -sL https://storage.googleapis.com/grafana-oncall-app/releases/grafana-oncall-app-${DRONE_TAG}.zip | md5sum | cut -d'' '' -f1)" -d url=https://github.com/grafana/oncall/grafana-plugin https://grafana.com/api/plugins'
     depends_on:
       - sign and package plugin
 
@@ -225,10 +235,15 @@ steps:
 
   - name: build and push docker image
     image: plugins/docker
+    environment:
+      # force docker to use buildkit feature, this will skip build stages that aren't required in the final image (ie. dev & dev-enterprise)
+      # https://github.com/docker/cli/issues/1134#issuecomment-406449342
+      DOCKER_BUILDKIT: 1
     settings:
       repo: grafana/oncall
       tags: ${DRONE_TAG}-amd64-linux
       dockerfile: engine/Dockerfile
+      target: prod
       context: engine/
       password:
         from_secret: docker_password
@@ -262,10 +277,15 @@ steps:
 
   - name: build and push docker image
     image: plugins/docker
+    environment:
+      # force docker to use buildkit feature, this will skip build stages that aren't required in the final image (ie. dev & dev-enterprise)
+      # https://github.com/docker/cli/issues/1134#issuecomment-406449342
+      DOCKER_BUILDKIT: 1
     settings:
       repo: grafana/oncall
       tags: ${DRONE_TAG}-arm64-linux
       dockerfile: engine/Dockerfile
+      target: prod
       context: engine/
       password:
         from_secret: docker_password
@@ -395,6 +415,6 @@ kind: secret
 name: drone_token
 ---
 kind: signature
-hmac: 8a060649c132677ba1b5693b5ac6c846c02f9a5bb645fe990b26a7ea42a0fb66
+hmac: f77d17560f910f1a99ab8230674dc25c226d2b3c73cb90e63e53fb8ba760d57a
 
 ...

.github/workflows/ci.yml

@@ -152,5 +152,6 @@ jobs:
           context: ./engine
           file: ./engine/Dockerfile
           push: false
+          target: prod
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

@@ -1,51 +1,8 @@
-# Backend
-*/db.sqlite3
-engine/oncall_dev.db
 *.pyc
 venv
 .python-version
-.env
-.env_hobby
-.env.dev
+
 .vscode
-dump.rdb
 .idea
-engine/celerybeat-schedule.db
-engine/sqlite_data
-jupiter_playbooks/*
-engine/reports/*.csv
-engine/jupiter_playbooks/*
-
-# Frontend dependencies
-node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
 .DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-.swp
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-scripts/gcom.token
-scripts/gcom_grafana.token
-scripts/gcom_raintank.token
-
-engine/extensions/
-
-grafana-plugin/frontend_enterprise
-
-uwsgi-local.ini
-celerybeat-schedule
+.env

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## v1.0.52 (2022-11-09)
+
+- Allow use of API keys as alternative to account auth token for Twilio
+- Remove `grafana_plugin_management` Django app
+- Enable new schedules UI
+- Bug fixes
+
 ## v1.0.51 (2022-11-05)
 
 - Bug Fixes