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 Fix grafana renderer for PMM 2. #3270

Merged
merged 2 commits into from
Oct 28, 2024
+11 −1
Merged

PMM-12593 Fix grafana renderer for PMM 2. #3270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
118ed5b
PMM-12593 Fix grafana renderer for PMM 2.
BupycHuk Oct 24, 2024
868cb40
Merge branch 'main' into PMM-12593-run-grafana-renderer-for-pmm2
BupycHuk Oct 28, 2024
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
9 changes: 9 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ services:
- DBAAS_DBAAS_OP_CHANNEL=${DBAAS_DBAAS_OP_CHANNEL}
- DBAAS_ALLOW_UNSUPPORTED_OPERATORS=${DBAAS_ALLOW_UNSUPPORTED_OPERATORS:-0}
- PERCONA_TEST_DBAAS_PMM_CLIENT=${PERCONA_TEST_DBAAS_PMM_CLIENT}
- GF_RENDERING_SERVER_URL=http://renderer:8081/render
- GF_RENDERING_CALLBACK_URL=https://pmm-server:8443/graph/
# - PERCONA_TEST_PLATFORM_ADDRESS=https://check.localhost
# - PERCONA_TEST_PLATFORM_INSECURE=1
# - PERCONA_TEST_PLATFORM_PUBLIC_KEY=<public key>
Expand Down Expand Up @@ -101,6 +103,13 @@ services:
# /opt/entrypoint.sh
# "

renderer:
image: grafana/grafana-image-renderer:latest
networks:
- ${NETWORK:-default}
ports:
- 8081:8081

# PMM with external DBs
ch:
profiles:
Expand Down
2 changes: 2 additions & 0 deletions update/ansible/playbook/tasks/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.
serve_from_sub_path = true

#################################### Snapshots ###########################
[snapshots]
Expand Down
1 change: 0 additions & 1 deletion update/ansible/playbook/tasks/roles/nginx/files/conf.d/pmm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,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
Loading