From 24a657b61727708311a4b4832b8521ced970eb06 Mon Sep 17 00:00:00 2001 From: Matvey Kukuy Date: Tue, 14 Jun 2022 17:39:25 +0300 Subject: [PATCH] Fixing port --- .env.example | 6 ++++-- DEVELOPER.md | 4 ++-- README.md | 2 +- docker-compose.yml | 2 +- docs/sources/open-source.md | 2 +- .../src/containers/PluginConfigPage/PluginConfigPage.tsx | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.env.example b/.env.example index b8794c10..529d3ce9 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,5 @@ +RUNSERVER_PORT=8080 + SLACK_CLIENT_OAUTH_ID= SLACK_CLIENT_OAUTH_SECRET= SLACK_API_TOKEN= @@ -19,13 +21,13 @@ SENDGRID_FROM_EMAIL= DJANGO_SETTINGS_MODULE=settings.dev SECRET_KEY=jkashdkjashdkjh -BASE_URL=http://localhost:8000 +BASE_URL=http://localhost:8080 FEATURE_TELEGRAM_INTEGRATION_ENABLED=True FEATURE_SLACK_INTEGRATION_ENABLED=True FEATURE_EXTRA_MESSAGING_BACKENDS_ENABLED= -SLACK_INSTALL_RETURN_REDIRECT_HOST=http://localhost:8000 +SLACK_INSTALL_RETURN_REDIRECT_HOST=http://localhost:8080 SOCIAL_AUTH_REDIRECT_IS_HTTPS=False GRAFANA_INCIDENT_STATIC_API_KEY= diff --git a/DEVELOPER.md b/DEVELOPER.md index 8af642f3..08086609 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -73,7 +73,7 @@ python manage.py start_celery celery -A engine beat -l info ``` -4. All set! Check out internal API endpoints at http://localhost:8000/. +4. All set! Check out internal API endpoints at http://localhost:8080/. ### Frontend setup @@ -102,7 +102,7 @@ python manage.py issue_invite_for_the_frontend --override 6. Some configuration fields will appear be available. Fill them out and click Initialize OnCall ``` OnCall API URL: -http://host.docker.internal:8000 +http://host.docker.internal:8080 Invitation Token (Single use token to connect Grafana instance): Response from the invite generator command (check above) diff --git a/README.md b/README.md index 0060cde3..a726318a 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ docker-compose --env-file .env_hobby -f docker-compose.yml run engine python man 5. Go to [OnCall Plugin Configuration](http://localhost:3000/plugins/grafana-oncall-app) (or find OnCall plugin in configuration->plugins) and connect OnCall _plugin_ with OnCall _backend_: ``` Invite token: ^^^ from the previous step. -OnCall backend URL: http://engine:8000 +OnCall backend URL: http://engine:8080 Grafana Url: http://grafana:3000 ``` diff --git a/docker-compose.yml b/docker-compose.yml index 354219d0..c4695fd8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: # image: ... build: engine ports: - - 8000:8080 + - 8080:8080 command: > sh -c "uwsgi --ini uwsgi.ini" environment: diff --git a/docs/sources/open-source.md b/docs/sources/open-source.md index 8d77b0d0..703d6aa5 100644 --- a/docs/sources/open-source.md +++ b/docs/sources/open-source.md @@ -32,7 +32,7 @@ Grafana OnCall Slack integration use a lot of Slack API features: # Choose the unique prefix instead of pretty-turkey-83 # Localtunnel will generate an url, e.g. https://pretty-turkey-83.loca.lt # it is referred as below -lt --port 8000 -s pretty-turkey-83 --print-requests +lt --port 8080 -s pretty-turkey-83 --print-requests ``` 3. If you use localtunnel, open your external URL and click "Continue" to allow requests to bypass the warning page. diff --git a/grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx b/grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx index d4664d4e..d3996c51 100644 --- a/grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx +++ b/grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx @@ -297,10 +297,10 @@ Seek for such a line: “Your invite token: <> , use it in the Graf label="OnCall backend URL" description={ - It should be rechable from Grafana. Possible options:
- http://host.docker.internal:8000 (if you run backend in the docker locally) + It should be reachable from Grafana. Possible options:
+ http://host.docker.internal:8080 (if you run backend in the docker locally)
- http://localhost:8000
+ http://localhost:8080
...
}