From 10c50bd81c3f9c8294255249fb641e21316fc861 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Fri, 5 Feb 2021 17:25:03 +1100
Subject: [PATCH] Update to latest community sources

---
 .gitignore       |  1 +
 ansible-pcp.spec | 23 ++++++++++++++++-------
 sources          |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index becc2c1..8a56c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ansible-pcp-2.0.3.tar.gz
+/ansible-pcp-2.1.2.tar.gz
diff --git a/ansible-pcp.spec b/ansible-pcp.spec
index 74579cf..a4497a8 100644
--- a/ansible-pcp.spec
+++ b/ansible-pcp.spec
@@ -1,8 +1,13 @@
+%if 0%{?rhel} == 0
 %global collection_namespace performancecopilot
 %global collection_name metrics
+%else
+%global collection_namespace redhat
+%global collection_name rhel_metrics
+%endif
 
 Name:             ansible-pcp
-Version:          2.0.3
+Version:          2.1.2
 Release:          1%{?dist}
 Summary:          Ansible Metric collection for Performance Co-Pilot
 License:          MIT
@@ -19,17 +24,17 @@ A collection containing roles for Performance Co-Pilot (PCP) and related
 software such as Redis and Grafana.  The collection is made up of several
 Ansible roles, including:
 
-performancecopilot.metrics.pcp
+%{collection_namespace}.%{collection_name}.pcp
 A role for core PCP capabilities, configuring live performance analysis
 with a large base set of metrics from the kernel and system services, as
 well as data recording and rule inference.
 
-performancecopilot.metrics.redis
+%{collection_namespace}.%{collection_name}.redis
 A role for configuring a local Redis server, suitable for use with a
 Performance Co-Pilot archive repository (for single or many hosts) and
 fast, scalable querying of metrics.
 
-performancecopilot.metrics.grafana
+%{collection_namespace}.%{collection_name}.grafana
 A role for configuring a local Grafana server, providing web frontend
 visuals for Performance Co-Pilot metrics, both live and historically.
 Data sources for Vector (live), Redis (historical) and interactive
@@ -37,13 +42,13 @@ bpftrace (eBPF) scripts can be configured by this role.  The PCP REST
 API service (from the core pcp role) should be configured in order to
 use this role.
 
-performancecopilot.metrics.bpftrace
+%{collection_namespace}.%{collection_name}.bpftrace
 A role that extends the core PCP role, providing metrics from bpftrace
 scripts using Linux eBPF facilities.  Configuring authentication of a
 local user capable of running bpftrace scripts via the PCP agent is a
 key task of this role.
 
-performancecopilot.metrics.elasticsearch
+%{collection_namespace}.%{collection_name}.elasticsearch
 A role that extends the core PCP role, providing metrics from a live
 ElasticSearch instance for PCP analysis or exporting of PCP metric
 values (and metadata) to ElasticSearch for the indexing and querying
@@ -51,7 +56,7 @@ of performance data.
 
 %prep
 %autosetup
-rm -vr .travis .github .gitignore .ansible-lint .*.yml
+rm -vr .github .gitignore .ansible-lint .*.yml
 
 %build
 %ansible_collection_build
@@ -68,6 +73,10 @@ ansible-lint `find roles -name \*.yml`
 %{ansible_collection_files}
 
 %changelog
+* Fri Feb 05 2021 Nathan Scott <nathans@redhat.com> 2.1.2-1
+- Add RHEL macros to the spec alongside Fedora
+- Latest upstream release
+
 * Wed Nov 11 2020 Nathan Scott <nathans@redhat.com> 2.0.3-1
 - Updated for new version with changed namespace
 - Ansible collection macros now used in the spec
diff --git a/sources b/sources
index bcc4123..47674c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ansible-pcp-2.0.3.tar.gz) = d9df466ccb5f69bcd6f3add8b25892994fc1bc6bc94c8bd798fcfa1b2cfdab87b3344b6008739570b8c21802dc794c6438ecc47896b8620e23fe4dd62fd150a8
+SHA512 (ansible-pcp-2.1.2.tar.gz) = 0babea9669dd8aefc3fc3f334eac89f114897cf16341c208287bf8a85252caa0c196c28050caa4219925c5b858dfaf93dc2988a7348f2f96ed9069cfbdb68f44