Merge pull request #373 from grafana/dev

Merge dev to main for 1.0.22 release

Author: mderynck

.drone.yml

@@ -47,33 +47,6 @@ steps:
       ref:
         - refs/tags/v*.*.*
 
-  - name: Publish Plugin to Github (release)
-    image: plugins/github-release
-    settings:
-      api_key:
-        from_secret: gh_token
-      files: grafana-plugin/ci/dist/grafana-oncall-app-${DRONE_TAG}.zip
-      title: ${DRONE_TAG}
-    depends_on:
-      - Sign and Package Plugin
-    when:
-      ref:
-        - refs/tags/v*.*.*
-
-  - name: Publish Plugin to grafana.com (release)
-    image: curlimages/curl:7.73.0
-    environment:
-      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"
-    depends_on:
-      - Publish Plugin to GCS (release)
-      - Publish Plugin to Github (release)
-    when:
-      ref:
-        - refs/tags/v*.*.*
-
   - name: Lint Backend
     image: python:3.9
     environment:
@@ -142,7 +115,6 @@ steps:
     when:
       ref:
         - refs/heads/dev
-        - refs/tags/v*.*.*
 
 # Services for Unit Test Backend
 services:
@@ -170,6 +142,124 @@ trigger:
       - refs/heads/dev
       - refs/tags/v*.*.*
 
+---
+kind: pipeline
+type: docker
+name: OSS Release
+
+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: Build Plugin
+    image: node:14.6.0-stretch
+    commands:
+      - apt-get update
+      - apt-get --assume-yes install jq
+      - cd grafana-plugin/
+      - if [ -z "$DRONE_TAG" ]; then echo "No tag, not modifying version"; else jq '.version="${DRONE_TAG}"' package.json > package.new && mv package.new package.json && jq '.version' package.json; fi
+      - yarn --network-timeout 500000
+      - yarn build
+      - ls ./
+    depends_on:
+      - Check Promote
+    when:
+      event:
+        - promote
+      target:
+        - oss
+      ref:
+        - refs/tags/v*.*.*
+
+  - name: Sign and Package Plugin
+    image: node:14.6.0-stretch
+    environment:
+      GRAFANA_API_KEY:
+        from_secret: gcom_plugin_publisher_api_key
+    depends_on:
+      - Build Plugin
+    commands:
+      - apt-get update
+      - apt-get install zip
+      - cd grafana-plugin
+      - yarn sign
+      - yarn ci-build:finish
+      - yarn ci-package
+      - cd ci/dist
+      - zip -r grafana-oncall-app.zip ./grafana-oncall-app
+      - if [ -z "$DRONE_TAG" ]; then echo "No tag, skipping archive"; else cp grafana-oncall-app.zip grafana-oncall-app-${DRONE_TAG}.zip; fi
+
+  - name: Publish Plugin to Github (release)
+    image: plugins/github-release
+    settings:
+      api_key:
+        from_secret: gh_token
+      files: grafana-plugin/ci/dist/grafana-oncall-app-${DRONE_TAG}.zip
+      title: ${DRONE_TAG}
+    depends_on:
+      - Sign and Package Plugin
+
+  - name: Publish Plugin to grafana.com (release)
+    image: curlimages/curl:7.73.0
+    environment:
+      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"
+    depends_on:
+      - Publish Plugin to Github (release)
+
+  - 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

.github/workflows/ci.yml

@@ -65,3 +65,36 @@ jobs:
           cd engine/
           pip install -r requirements.txt
           ./wait_for_test_mysql_start.sh && pytest --ds=settings.ci-test -x
+
+  unit-test-backend-postgresql:
+    runs-on: ubuntu-latest
+    container: python:3.9
+    env:
+      DB_BACKEND: postgresql
+      DJANGO_SETTINGS_MODULE: settings.ci-test
+      SLACK_CLIENT_OAUTH_ID: 1
+    services:
+      rabbit_test:
+        image: rabbitmq:3.7.19
+        env:
+          RABBITMQ_DEFAULT_USER: rabbitmq
+          RABBITMQ_DEFAULT_PASS: rabbitmq
+      postgresql_test:
+        image: postgres:14.4
+        env:
+          POSTGRES_DB: oncall_local_dev
+          POSTGRES_PASSWORD: local_dev_pwd
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v2
+      - name: Unit Test Backend
+        run: |
+          cd engine/
+          pip install -r requirements.txt
+          pytest --ds=settings.ci-test -x
+

CHANGELOG.md

@@ -1,8 +1,11 @@
 # Change Log
 
+## v1.0.22 (2022-08-16)
+- Make STATIC_URL configurable from environment variable
+
 ## v1.0.21 (2022-08-12)
 - Bug fixes
-- 
+
 ## v1.0.19 (2022-08-10)
 - Bug fixes
 

DEVELOPER.md

@@ -31,6 +31,8 @@
 docker-compose -f docker-compose-developer.yml up -d
 ```
 
+NOTE: to use a PostgreSQL db backend, use the `docker-compose-developer-pg.yml` file instead.
+
 2. Prepare a python environment:
 ```bash
 # Create and activate the virtual environment
@@ -45,6 +47,9 @@ pip install -U pip wheel
 # Copy and check .env file.
 cp .env.example .env
 
+# NOTE: if you want to use the PostgreSQL db backend add DB_BACKEND=postgresql to your .env file;
+#       currently allowed backend values are `mysql` (default) and `postgresql`
+
 # Apply .env to current terminal.
 # For PyCharm it's better to use https://plugins.jetbrains.com/plugin/7861-envfile/
 export $(grep -v '^#' .env | xargs -0)

docker-compose-developer-pg.yml

@@ -0,0 +1,74 @@
+version: '3.2'
+
+services:
+
+  postgres:
+    image: postgres:14.4
+    platform: linux/x86_64
+    mem_limit: 500m
+    cpus: 0.5
+    restart: always
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_DB: oncall_local_dev
+      POSTGRES_PASSWORD: empty
+      POSTGRES_INITDB_ARGS: '--encoding=UTF-8'
+
+  redis:
+    image: redis
+    mem_limit: 100m
+    cpus: 0.1
+    restart: always
+    ports:
+      - 6379:6379
+
+  rabbit:
+    image: "rabbitmq:3.7.15-management"
+    mem_limit: 1000m
+    cpus: 0.5
+    environment:
+      RABBITMQ_DEFAULT_USER: "rabbitmq"
+      RABBITMQ_DEFAULT_PASS: "rabbitmq"
+      RABBITMQ_DEFAULT_VHOST: "/"
+    ports:
+      - 15672:15672
+      - 5672:5672
+
+  mysql-to-create-grafana-db:
+    image: mysql:5.7
+    platform: linux/x86_64
+    mem_limit: 500m
+    cpus: 0.5
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    restart: always
+    ports:
+      - 3306:3306
+    environment:
+      MYSQL_ROOT_PASSWORD: empty
+      MYSQL_DATABASE: grafana
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
+
+  grafana:
+    image: "grafana/grafana:9.0.0-beta3"
+    restart: always
+    mem_limit: 500m
+    cpus: 0.5
+    environment:
+      GF_DATABASE_TYPE: mysql
+      GF_DATABASE_HOST: mysql
+      GF_DATABASE_USER: root
+      GF_DATABASE_PASSWORD: empty
+      GF_SECURITY_ADMIN_USER: oncall
+      GF_SECURITY_ADMIN_PASSWORD: oncall
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-oncall-app
+    volumes:
+      - ./grafana-plugin:/var/lib/grafana/plugins/grafana-plugin
+    ports:
+      - 3000:3000
+    depends_on:
+      mysql-to-create-grafana-db:
+        condition: service_healthy

docker-compose-developer.yml

@@ -65,5 +65,5 @@ services:
     ports:
       - 3000:3000
     depends_on:
-      mysql:
+      mysql-to-create-grafana-db:
         condition: service_healthy

docs/sources/getting-started.md

@@ -83,7 +83,7 @@ For more information on Escalation Chains and more ways to customize them, refer
 In order for Grafana OnCall to notify you of an alert, you must configure how you want to be notified. Personal notification policies, chatops integrations, and on-call schedules allow you to automate how users are notified of alerts.
 
 ### Configure personal notification policies 
-Personal notification policies determine how a user is notified for a certain type of alert. Administrators can configure how users receive notification for certain types of alerts. For more information on personal notification policies, refer to [Manage users and teams for Grafana OnCall]({{< relref "configure-user-settings/" >}})
+Personal notification policies determine how a user is notified for a certain type of alert. Get notified by SMS, phone call, or Slack mentions. Administrators can configure how users receive notification for certain types of alerts. For more information on personal notification policies, refer to [Manage users and teams for Grafana OnCall]({{< relref "configure-user-settings/" >}})
 
 To configure users personal notification policies: