From 78f7d960d68367a3687ecf25058db17eec0efbe0 Mon Sep 17 00:00:00 2001
From: Matvey Kukuy <matvey@amixr.io>
Date: Fri, 10 Jun 2022 22:58:46 +0300
Subject: [PATCH] Polishing...

---
 .gitignore                                    |  2 +-
 docker-compose-developer.yml                  |  2 +-
 docker-compose.yml                            |  2 +-
 engine/scripts/start_all_in_one.sh            | 34 -------------------
 .../PluginConfigPage/PluginConfigPage.tsx     |  2 +-
 grafana-plugin/src/pages/cloud/CloudPage.tsx  |  4 +--
 6 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 engine/scripts/start_all_in_one.sh

diff --git a/.gitignore b/.gitignore
index d5099b36..b00b88a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 *.pyc
 venv
 .env
-.env-hobby
+.env_hobby
 .vscode
 dump.rdb
 .idea
diff --git a/docker-compose-developer.yml b/docker-compose-developer.yml
index da915f78..71280b77 100644
--- a/docker-compose-developer.yml
+++ b/docker-compose-developer.yml
@@ -48,7 +48,7 @@ services:
         condition: service_healthy
 
   grafana:
-    image: "grafana/grafana:8.5.5"
+    image: "grafana/grafana:9.0.0-beta3"
     restart: always
     mem_limit: 500m
     cpus: 0.5
diff --git a/docker-compose.yml b/docker-compose.yml
index bf5c1d35..868e309f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -143,7 +143,7 @@ services:
       - with_grafana
 
   grafana:
-    image: "grafana/grafana:8.3.2"
+    image: "grafana/grafana:9.0.0-beta3"
     mem_limit: 500m
     ports:
       - 3000:3000
diff --git a/engine/scripts/start_all_in_one.sh b/engine/scripts/start_all_in_one.sh
deleted file mode 100644
index f4a64e39..00000000
--- a/engine/scripts/start_all_in_one.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-export DJANGO_SETTINGS_MODULE=settings.all_in_one
-
-generate_value_if_not_exist ()
-{
-  if [ ! -f /etc/app/secret_data/$1 ]; then
-    touch /etc/app/secret_data/$1
-    base64 /dev/urandom | head -c $2 > /etc/app/secret_data/$1
-fi
-export $1=$(cat /etc/app/secret_data/$1)
-}
-
-generate_value_if_not_exist SECRET_KEY 75
-
-generate_value_if_not_exist MIRAGE_SECRET_KEY 75
-generate_value_if_not_exist MIRAGE_CIPHER_IV 16
-
-export BASE_URL=http://localhost:8000
-
-echo "Starting redis in the background"
-# Redis will dump the changes to the volume every 60 seconds if at least 1 key changed
-redis-server --daemonize yes --save 60 1 --dir /etc/app/redis_data/
-echo "Running migrations"
-python manage.py migrate
-
-echo "Start celery"
-python manage.py start_celery &
-
-# Postponing token issuing to make sure it's the last record in the console.
-bash -c 'sleep 10; python manage.py issue_invite_for_the_frontend --override' &
-
-echo "Starting server"
-python manage.py runserver 0.0.0.0:8000 --noreload
diff --git a/grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx b/grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx
index 74c42005..92725630 100644
--- a/grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx
+++ b/grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx
@@ -299,7 +299,7 @@ http://localhost:8000
           >
             <Input id="onCallApiUrl" onChange={handleApiUrlChange} defaultValue={onCallApiUrl} />
           </Field>
-          <Field label="Grafana Url" description="URL of the current Grafana instance. ">
+          <Field label="Grafana URL" description="URL of the current Grafana instance. ">
             <Input id="grafanaUrl" onChange={handleGrafanaUrlChange} defaultValue={grafanaUrl} />
           </Field>
           {/* <WithConfirm title="Admin API key for OnCall will be created in Grafana. Continue?" confirmText="Continue"> */}
diff --git a/grafana-plugin/src/pages/cloud/CloudPage.tsx b/grafana-plugin/src/pages/cloud/CloudPage.tsx
index c02cf162..02ae2493 100644
--- a/grafana-plugin/src/pages/cloud/CloudPage.tsx
+++ b/grafana-plugin/src/pages/cloud/CloudPage.tsx
@@ -289,7 +289,7 @@ const CloudPage = observer((props: CloudPageProps) => {
                       </Button>
                     ) : (
                       <Button variant="primary" onClick={syncUsers} icon="sync">
-                        Sync users
+                        Sync users (Editors and Admins)
                       </Button>
                     )}
                   </HorizontalGroup>
@@ -351,7 +351,7 @@ const CloudPage = observer((props: CloudPageProps) => {
             <Icon name="bell" className={cx('block-icon')} size="lg" /> SMS and phone call notifications
           </Text.Title>
 
-          <Text type="secondary">Users matched between OSS and Cloud OnCall currently unavialable.</Text>
+          <Text type="secondary">Users matched between OSS and Cloud OnCall currently unavailable.</Text>
         </VerticalGroup>
       </Block>
     </VerticalGroup>