PMM-12045 transition to unified grafana binary (#2368)

* PMM-12045 transition to unified grafana binary

* PMM-12045 make log.format explicit vs implicit

* PMM-12045 use the FB image to test pmm-managed

* PMM-12045 change `root_url` back to the default value

* PMM-12045 revert root_url override

* PMM-12045 use dev-latest for tests

* PMM-12045 revert all configs

* PMM-12045 test grafana server

* PMM-12045 remove the log overrides

* PMM-12045 remove the paths overrides

* PMM-12045 fix grafana-cli

* PMM-12045 add root_url to grafana.ini

* PMM-12045 remove the root_url override

* PMM-12045 set the domain in grafana.ini

* PMM-12045 trigger the build

build/ansible/roles/pmm2-images/files/grafana.ini

@@ -4,16 +4,9 @@
 [program:grafana]
 priority = 3
 command =
-    /usr/sbin/grafana-server
+    /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.paths.logs=/srv/logs
-        cfg:default.log.mode=console
-        cfg:default.log.console.format=console
-        cfg:default.server.root_url="https://%%(domain)s/graph"
-
 user = grafana
 directory = /usr/share/grafana
 autorestart = true

build/packages/deb/postinst

@@ -25,7 +25,7 @@ case "$1" in
     ;;
 
     *)
-        echo "postinst called with unknown argument \`$1'" >&2
+        echo "postinst called with unknown argument '$1'" >&2
         exit 1
     ;;
 esac

build/scripts/build-server-rpm

@@ -126,7 +126,7 @@ build() {
 		    sleep 1
             done
 
-            sudo yum-builddep --randomwait=5 -y SOURCES/${spec_name}.spec
+            sudo yum-builddep --randomwait=1 -y SOURCES/${spec_name}.spec
 
             spectool -C SOURCES -g SOURCES/${spec_name}.spec
             rpmbuild --define '_rpmdir %{_topdir}/RPMS/${spec_name}-${rpm_version}' --define 'dist .${rpmbuild_dist}' -ba SOURCES/${spec_name}.spec

managed/services/supervisord/supervisord.go

@@ -779,15 +779,9 @@ redirect_stderr = true
 [program:grafana]
 priority = 3
 command =
-    /usr/sbin/grafana-server
+    /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.paths.logs=/srv/logs
-        cfg:default.log.mode=console
-        cfg:default.log.console.format=console
-        cfg:default.server.root_url="https://%%(domain)s/graph"
         {{- if .PerconaSSODetails}}
         cfg:default.server.domain="{{ .PMMServerAddress }}"
         cfg:default.auth.generic_oauth.enabled=true

managed/testdata/supervisord.d/grafana.ini

@@ -3,15 +3,9 @@
 [program:grafana]
 priority = 3
 command =
-    /usr/sbin/grafana-server
+    /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.paths.logs=/srv/logs
-        cfg:default.log.mode=console
-        cfg:default.log.console.format=console
-        cfg:default.server.root_url="https://%%(domain)s/graph"
 environment =
     PERCONA_TEST_POSTGRES_ADDR="",
     PERCONA_TEST_POSTGRES_DBNAME="",

update/ansible/playbook/tasks/files/change-admin-password

@@ -2,4 +2,4 @@
 #
 # Change password for default admin user in PMM
 
-grafana-cli --config=/etc/grafana/grafana.ini --homepath /usr/share/grafana --configOverrides cfg:default.paths.data=/srv/grafana admin reset-admin-password $1
+grafana cli --config=/etc/grafana/grafana.ini --homepath /usr/share/grafana admin reset-admin-password $1

update/ansible/playbook/tasks/roles/grafana/files/grafana.ini

@@ -4,11 +4,29 @@
 [paths]
 # Directory where grafana will automatically scan and look for plugins
 plugins = /srv/grafana/plugins
+# Directory where grafana can store logs
+logs = /srv/logs
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+data = /srv/grafana
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and file
+mode = console
+
+# For "console" mode only
+[log.console]
+# log line format, valid options are text, console and json
+format = console
 
 #################################### Server ####################################
 [server]
 # enable gzip
 enable_gzip = true
+# The public facing domain name used to access grafana from a browser
+domain = 127.0.0.1
+# The full public facing url
+root_url = https://%(domain)s/graph
 
 #################################### Snapshots ###########################
 [snapshots]

update/ansible/playbook/tasks/roles/grafana/tasks/main.yml

@@ -5,23 +5,23 @@
     state: directory
     owner: grafana
     group: grafana
-    mode: '0775'
+    mode: "0775"
   loop:
     - /srv/grafana
     - /srv/grafana/plugins
 
 - name: Set Grafana folder for plugins on /srv partition for all users
   lineinfile:
     path: /etc/bashrc
-    line: 'export GF_PLUGIN_DIR=/srv/grafana/plugins'
+    line: "export GF_PLUGIN_DIR=/srv/grafana/plugins"
 
 - name: Copy new version of grafana.ini
   copy:
     src: grafana.ini
     dest: /etc/grafana/grafana.ini
     owner: grafana
     group: grafana
-    mode: '0444'
+    mode: "0444"
 
 - name: Create provisioning directory
   file:
@@ -46,5 +46,5 @@
     - dashboards
 
 - name: Upgrade grafana database (Get the latest schema)
-  command: grafana-cli --homepath=/usr/share/grafana admin data-migration encrypt-datasource-passwords
+  command: grafana cli --homepath=/usr/share/grafana admin data-migration encrypt-datasource-passwords
   changed_when: True