Merge pull request #95 from grafana/dev

Merge dev to main
grafana · Jun 15, 2022 · 3db90db · 3db90db
2 parents 46f95aa + a3ee992
commit 3db90db
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,18 @@ jobs:
       - name: Lint All
         run: |
           pre-commit run --all-files
-          
+
+  test-technical-documentation:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Check out code"
+        uses: "actions/checkout@v3"
+      - name: "Build website"
+        # -e HUGO_REFLINKSERRORLEVEL=ERROR prevents merging broken refs with the downside
+        # that no refs to external content can be used as these refs will not resolve in the
+        # docs-base image.
+        run: |
+          docker run -v ${PWD}/docs/sources:/hugo/content/docs/oncall/latest -e HUGO_REFLINKSERRORLEVEL=ERROR --rm grafana/docs-base:latest /bin/bash -c 'make hugo'
 
   unit-test-backend:
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Latest Release](https://img.shields.io/github/v/release/grafana/oncall?display_name=tag&sort=semver)](https://github.com/grafana/oncall/releases)
 [![License](https://img.shields.io/github/license/grafana/oncall)](https://github.com/grafana/oncall/blob/dev/LICENSE)
 [![Docker Pulls](https://img.shields.io/docker/pulls/grafana/oncall)](https://hub.docker.com/r/grafana/oncall/tags)
-[![Slack](https://img.shields.io/badge/join%20slack-%23grafana-%2Doncall-brightgreen.svg)](https://grafana.slack.com/archives/C02LSUUSE2G)
+[![Slack](https://img.shields.io/badge/join%20slack-%23grafana-%2Doncall-brightgreen.svg)](https://slack.grafana.com/)
 [![Discussion](https://img.shields.io/badge/discuss-oncall%20forum-orange.svg)](https://github.com/grafana/oncall/discussions)
 [![Build Status](https://drone.grafana.net/api/badges/grafana/oncall/status.svg?ref=refs/heads/dev)](https://drone.grafana.net/grafana/oncall)
 

diff --git a/docs/README.md b/docs/README.md
@@ -1,6 +1,6 @@
 # Grafana Cloud Documentation
 
-Source for documentation at https://grafana.com/docs/amixr/
+Source for documentation at https://grafana.com/docs/oncall/
 
 ## Preview the website
 

diff --git a/engine/config_integrations/alertmanager.py b/engine/config_integrations/alertmanager.py
@@ -96,7 +96,7 @@
 {%- if "status" in payload -%}
 <b>Status</b>: {{ payload.status }}
 {% endif -%}
-<b>Labels:** {% for k, v in payload["labels"].items() %}
+<b>Labels:</b> {% for k, v in payload["labels"].items() %}
 {{ k }}: {{ v }}{% endfor %}
 <b>Annotations:</b> 
 {%- for k, v in payload.get("annotations", {}).items() %}
@@ -211,7 +211,7 @@
         "title": "KubeJobCompletion",
         "message": (
             "<b>Status</b>: firing\n"
-            "<b>Labels:** \n"
+            "<b>Labels:</b> \n"
             "job: kube-state-metrics\n"
             "instance: 10.143.139.7:8443\n"
             "job_name: email-tracking-perform-initialization-1.0.50\n"

diff --git a/engine/settings/base.py b/engine/settings/base.py
@@ -350,6 +350,8 @@
 SOCIAL_AUTH_SLACK_LOGIN_SECRET = SLACK_CLIENT_OAUTH_SECRET
 
 SOCIAL_AUTH_SETTING_NAME_TO_LIVE_SETTING_NAME = {
+    "SOCIAL_AUTH_SLACK_LOGIN_KEY": "SLACK_CLIENT_OAUTH_ID",
+    "SOCIAL_AUTH_SLACK_LOGIN_SECRET": "SLACK_CLIENT_OAUTH_SECRET",
     "SOCIAL_AUTH_SLACK_INSTALL_FREE_KEY": "SLACK_CLIENT_OAUTH_ID",
     "SOCIAL_AUTH_SLACK_INSTALL_FREE_SECRET": "SLACK_CLIENT_OAUTH_SECRET",
 }

diff --git a/engine/uwsgi.ini b/engine/uwsgi.ini
@@ -11,7 +11,6 @@ harakiri=620
 max-requests=5000
 vacuum=True
 buffer-size=65535
-listen=1024
 http-auto-chunked=True
 http-timeout=620
 post-buffering=1