From 5a67e83cd3b2ed59dc46a6fb087dc77184e23001 Mon Sep 17 00:00:00 2001 From: Alex Tymchuk Date: Sun, 16 Jul 2023 22:26:27 +0000 Subject: [PATCH] PMM-12045 remove the paths overrides --- build/ansible/roles/pmm2-images/files/grafana.ini | 2 -- managed/services/supervisord/supervisord.go | 2 -- managed/testdata/supervisord.d/grafana.ini | 2 -- 3 files changed, 6 deletions(-) diff --git a/build/ansible/roles/pmm2-images/files/grafana.ini b/build/ansible/roles/pmm2-images/files/grafana.ini index 1ad764d374..97627eb96d 100644 --- a/build/ansible/roles/pmm2-images/files/grafana.ini +++ b/build/ansible/roles/pmm2-images/files/grafana.ini @@ -7,8 +7,6 @@ command = /usr/sbin/grafana server --homepath=/usr/share/grafana --config=/etc/grafana/grafana.ini - cfg:default.paths.data=/srv/grafana - cfg:default.paths.plugins=/srv/grafana/plugins cfg:default.server.root_url="https://%%(domain)s/graph" user = grafana diff --git a/managed/services/supervisord/supervisord.go b/managed/services/supervisord/supervisord.go index bbb7f5fef0..e0398317d7 100644 --- a/managed/services/supervisord/supervisord.go +++ b/managed/services/supervisord/supervisord.go @@ -782,8 +782,6 @@ command = /usr/sbin/grafana server --homepath=/usr/share/grafana --config=/etc/grafana/grafana.ini - cfg:default.paths.data=/srv/grafana - cfg:default.paths.plugins=/srv/grafana/plugins cfg:default.server.root_url="https://%%(domain)s/graph" {{- if .PerconaSSODetails}} cfg:default.server.domain="{{ .PMMServerAddress }}" diff --git a/managed/testdata/supervisord.d/grafana.ini b/managed/testdata/supervisord.d/grafana.ini index 960d4746c3..4ed86d9ea9 100644 --- a/managed/testdata/supervisord.d/grafana.ini +++ b/managed/testdata/supervisord.d/grafana.ini @@ -6,8 +6,6 @@ command = /usr/sbin/grafana server --homepath=/usr/share/grafana --config=/etc/grafana/grafana.ini - cfg:default.paths.data=/srv/grafana - cfg:default.paths.plugins=/srv/grafana/plugins cfg:default.server.root_url="https://%%(domain)s/graph" environment = PERCONA_TEST_POSTGRES_ADDR="",