Merge branch 'richm-no-openmetrics-el7'

Author: natoscott

docs/pcp/setup.yml

@@ -6,6 +6,7 @@
       vars:
         pcp_pmie_endpoint: https://example.com/webhook
         pcp_pmlogger_interval: 10
+        # NOTE: No openmetrics on EL7
         pcp_optional_agents: [dm, nfsclient, openmetrics]
         pcp_explicit_labels:
           environment: production

roles/pcp/README.md

@@ -89,6 +89,7 @@ Basic PCP setup with monitoring suited for a single host.
     - role: performancecopilot.metrics.pcp
       vars:
         pcp_pmlogger_interval: 10
+        # NOTE: No openmetrics on EL7
         pcp_optional_agents: [dm, nfsclient, openmetrics]
         pcp_explicit_labels:
           environment: production

roles/spark/tasks/main.yml

@@ -56,6 +56,7 @@
   when:
     - spark_metrics_provider == 'pcp'
     - spark_metrics_agent | d(false) | bool
+    - "'pcp-pmda-openmetrics' in __spark_packages_pcp"
 
 - name: Ensure PCP OpenMetrics agent is enabled with Spark endpoint
   file:
@@ -65,6 +66,7 @@
   when:
     - spark_metrics_provider == 'pcp'
     - spark_metrics_agent | d(false) | bool
+    - "'pcp-pmda-openmetrics' in __spark_packages_pcp"
 
 - name: Ensure correct service path for ostree systems
   when:

roles/spark/vars/CentOS_7.yml

@@ -5,3 +5,5 @@
 __spark_packages_export_pcp:
   - pcp-export-pcp2spark
   - pcp-system-tools
+
+__spark_packages_pcp: []

roles/spark/vars/RedHat_7.yml

@@ -5,3 +5,5 @@
 __spark_packages_export_pcp:
   - pcp-export-pcp2spark
   - pcp-system-tools
+
+__spark_packages_pcp: []