PMM-12641 stop Grafana before reinstalling the plugins

build/ansible/pmm/post-build.yml

@@ -126,10 +126,10 @@
         mode: 0775
 
     # nginx needs to be able to write to /var/lib/nginx, but it's owned by root.
-    - name: Change ownership of nginx dirs
-      file:
-        path: /var/lib/nginx
-        state: directory
-        group: pmm
-        owner: pmm
-        recurse: yes
+    # - name: Change ownership of nginx dirs
+    #   file:
+    #     path: /var/lib/nginx
+    #     state: directory
+    #     group: pmm
+    #     owner: pmm
+    #     recurse: yes

build/ansible/roles/dashboards/tasks/main.yml

@@ -1,4 +1,12 @@
 ---
+- name: Stop grafana
+  shell: "supervisorctl {{ item }} grafana"
+  become: true
+  become_user: pmm
+  become_method: su
+  loop:
+    - stop
+
 - name: Get plugin list
   find:
     paths: /usr/share/percona-dashboards/panels/
@@ -32,6 +40,5 @@
   become_user: pmm
   become_method: su
   loop:
-    - stop
     - remove
     - add

build/packages/rpm/client/pmm-client.spec

@@ -22,7 +22,7 @@ Requires(postun): systemd
 
 AutoReq:        no
 Conflicts:      pmm-client
-Obsoletes:	pmm2-client < 3.0.0
+Obsoletes:      pmm2-client < 3.0.0
 
 %description
 Percona Monitoring and Management (PMM) is an open-source platform for managing and monitoring MySQL and MongoDB