rebase metrics role to latest upstream

Rebase: 1937938

Related: rhbz#1961404

linux-system-roles.spec

@@ -121,7 +121,7 @@ BuildRequires: ansible >= 2.9.10
 %global rolename6 storage
 #%%deftag 6 1.2.2
 
-%defcommit 7 e81b2650108727f38b1c856699aad26af0f44a46
+%defcommit 7 c9b2ee085ccc741b5a9fa8a4b2a7a2f8c8551579
 %global rolename7 metrics
 #%%deftag 7 0.1.0
 
@@ -204,8 +204,6 @@ Patch54: network-ansible-test.diff
 
 Patch61: storage-ansible-test.diff
 
-Patch71: metrics-mssql-x86.diff
-
 Patch151: sshd-example.diff
 Patch152: sshd-work-on-ansible28-jinja27.diff
 
@@ -280,9 +278,6 @@ cd ..
 cd %{rolename6}
 %patch61 -p1
 cd ..
-cd %{rolename7}
-%patch71 -p1
-cd ..
 cd %{rolename15}
 %patch151 -p1
 %patch152 -p1

metrics-mssql-x86.diff

@@ -1,24 +0,0 @@
-From 7ff86f2fa05998afcd8ae87d9cdd660ef5b6ee2c Mon Sep 17 00:00:00 2001
-From: Jan Kurik <jkurik@redhat.com>
-Date: Thu, 18 Feb 2021 17:09:48 +1100
-Subject: [PATCH] Update mssql test to exclude non-x86_64 architectures
-
-pcp-pmda-mssql (and SQL Server itself) are x86_64-only.
----
- tests/tests_sanity_mssql.yml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/tests_sanity_mssql.yml b/tests/tests_sanity_mssql.yml
-index 6f1e2cc..8602c36 100644
---- a/tests/tests_sanity_mssql.yml
-+++ b/tests/tests_sanity_mssql.yml
-@@ -12,7 +12,8 @@
-     - meta: end_host
-       when: (ansible_distribution in ['RedHat'] and
-              ( ansible_facts['distribution_version'] is version('8.4', '<'))) or
--             ansible_distribution not in ['Fedora', 'RedHat']
-+             ansible_distribution not in ['Fedora', 'RedHat'] or
-+             ansible_architecture not in ['x86_64']
- 
-     - name: Save state of services
-       import_tasks: get_services_state.yml