Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PMM-12593 Run grafana renderer to render images. #3232

Open
wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

PMM-12593 Run grafana renderer to render images. #3232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/ansible/roles/grafana/files/grafana.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ format = console
enable_gzip = true
# The full public facing url
root_url = https://%(domain)s/graph
# Serve Grafana from subpath specified in `root_url` setting. By default it is set to false for compatibility reasons.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity: What was the compatibility reason though (is it with older PMM version?) and do we need to mention it here?

serve_from_sub_path = true

#################################### Snapshots ###########################
[snapshots]
Expand Down
1 change: 0 additions & 1 deletion build/ansible/roles/nginx/files/conf.d/pmm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
location /graph {
proxy_cookie_path / "/;";
proxy_pass http://127.0.0.1:3000;
rewrite ^/graph/(.*) /$1 break;
proxy_read_timeout 600;
proxy_http_version 1.1;
proxy_set_header Connection $connection_upgrade;
Expand Down
15 changes: 13 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ services:
- PMM_WATCHTOWER_HOST=${PMM_WATCHTOWER_HOST:-http://watchtower:8080}
- PMM_WATCHTOWER_TOKEN=${PMM_WATCHTOWER_TOKEN:-INSECURE_TOKEN}
- PMM_RELEASE_VERSION=3.0.0-alpha
- GF_RENDERING_SERVER_URL=http://renderer:8081/render
- GF_RENDERING_CALLBACK_URL=https://pmm-server:8443/graph/
# - PMM_DEV_VERSION_SERVICE_URL=http://localhost:11000
# - PMM_DEV_PERCONA_PLATFORM_PUBLIC_KEY=<public key>
# - PMM_DEV_TELEMETRY_INTERVAL=10s
Expand Down Expand Up @@ -93,7 +95,16 @@ services:
# /opt/entrypoint.sh
# "

# docker run -v /var/run/docker.sock:/var/run/docker.sock -e WATCHTOWER_HTTP_API_UPDATE=1 -e WATCHTOWER_HTTP_API_TOKEN=123 --hostname=watchtower --network=pmm_default docker.io/bupychuk/watchtower
renderer:
image: grafana/grafana-image-renderer:latest
ports:
- 8081:8081
environment:
- RENDERING_VERBOSE_LOGGING=true
- RENDERING_DUMPIO=true
- IGNORE_HTTPS_ERRORS=true
- LOG_LEVEL=debug

watchtower:
profiles:
- pmm
Expand All @@ -107,7 +118,7 @@ services:
networks:
- ${NETWORK:-default}
volumes:
- /var/run/docker.sock:${DOCKER_PATH:-/var/run/docker.sock}
- ${DOCKER_PATH:-/var/run/docker.sock}:/var/run/docker.sock

# PMM with external DBs
ch:
Expand Down
Loading