.github/workflows/auto_release.yml

@@ -1,8 +1,6 @@
 name: "Auto release"
 
 on:
-  schedule:
-    - cron: '0 3 * * 6'
   workflow_dispatch:
 
 env:

.github/workflows/pe_latest_testing.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
-          echo  "::set-output name=matrix::{\"platforms\":[{\"label\":\"CentOS-7\",\"provider\":\"provision::provision_service\",\"image\":\"centos-7\"},{\"label\":\"CentOS-8\",\"provider\":\"provision::provision_service\",\"image\":\"centos-8\"},{\"label\":\"RedHat-7\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-7\"},{\"label\":\"Ubuntu-1804\",\"provider\":\"provision::provision_service\",\"image\":\"ubuntu-1804-lts\"},{\"label\":\"RedHat-8\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-8\"},{\"label\":\"Sles-12\",\"provider\":\"provision::provision_service\",\"image\":\"sles-12\"}],\"collection\":[\"2021.2.0\"]}"
+          echo  "::set-output name=matrix::$(cat spec/fixtures/matrix/latest.json)"
     - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |

.github/workflows/pe_lts_testing.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
-          echo  "::set-output name=matrix::{\"platforms\":[{\"label\":\"CentOS-7\",\"provider\":\"provision::provision_service\",\"image\":\"centos-7\"},{\"label\":\"CentOS-8\",\"provider\":\"provision::provision_service\",\"image\":\"centos-8\"},{\"label\":\"RedHat-7\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-7\"},{\"label\":\"Ubuntu-1804\",\"provider\":\"provision::provision_service\",\"image\":\"ubuntu-1804-lts\"},{\"label\":\"RedHat-8\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-8\"},{\"label\":\"Sles-12\",\"provider\":\"provision::provision_service\",\"image\":\"sles-12\"}],\"collection\":[\"2019.8.7\"]}"
+          echo  "::set-output name=matrix::$(cat spec/fixtures/matrix/lts.json)"
     - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |

.github/workflows/spec.yml

@@ -7,6 +7,7 @@ on:
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
+  SHELLCHECK_OPTS: '-e SC1090 -e SC1091'
 
 jobs:
   setup_matrix:
@@ -120,7 +121,17 @@ jobs:
       - name: Run Static & Syntax Tests
         run: |
           buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
-      
+
       - name: Run parallel_spec tests
         run: |
           buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec
+  shellcheck:
+    name: Shellcheck
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run ShellCheck
+      uses: ludeeus/action-shellcheck@master
+
+
+

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v7.0.4](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/tree/v7.0.4) (2021-09-30)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/compare/v7.0.3...v7.0.4)
+
+### Fixed
+
+- \(SUP-2682\) Remove Requires= property from timers [\#146](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/pull/146) ([m0dular](https://github.com/m0dular))
+
 ## [v7.0.3](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/tree/v7.0.3) (2021-07-20)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-puppet_metrics_collector/compare/v7.0.2...v7.0.3)

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-puppet_metrics_collector",
-  "version": "7.0.3",
+  "version": "7.0.4",
   "author": "puppetlabs",
   "summary": "A Puppet module for gathering metrics from PE components",
   "license": "Apache-2.0",

pdk.yaml

@@ -0,0 +1,2 @@
+---
+ignore: []

spec/acceptance/pe_system_spec.rb

@@ -46,12 +46,6 @@
       expect(apply_manifest(pp).exit_code).not_to eq(1)
     end
 
-    it 'system puppet_* metric services should be active or inactive' do
-      run_shell('systemctl list-units --type=service | grep "puppet_system.*metrics"') do |r|
-        expect(r.stdout).to match(%r{activ})
-      end
-    end
-
     context 'system timers are running' do
       it { expect(service('puppet_system_cpu-metrics.timer')).to be_running }
       it { expect(service('puppet_system_cpu-tidy.timer')).to be_running }
@@ -82,12 +76,6 @@ class { 'puppet_metrics_collector::system':
       expect(package('sysstat')).to be_installed
     end
 
-    it 'system puppet_* metric services should be active or inactive' do
-      run_shell('systemctl list-units --type=service | grep "puppet_system.*metrics"') do |r|
-        expect(r.stdout).to match(%r{activ})
-      end
-    end
-
     context 'system timers are running' do
       it { expect(service('puppet_system_cpu-metrics.timer')).to be_running }
       it { expect(service('puppet_system_cpu-tidy.timer')).to be_running }

spec/fixtures/matrix/latest.json

@@ -0,0 +1 @@
+{"platforms":[{"label":"CentOS-7","provider":"provision::provision_service","image":"centos-7"},{"label":"CentOS-8","provider":"provision::provision_service","image":"centos-8"},{"label":"RedHat-7","provider":"provision::provision_service","image":"rhel-7"},{"label":"Ubuntu-1804","provider":"provision::provision_service","image":"ubuntu-1804-lts"},{"label":"RedHat-8","provider":"provision::provision_service","image":"rhel-8"},{"label":"Sles-12","provider":"provision::provision_service","image":"sles-12"}],"collection":["2021.3.0"]}

spec/fixtures/matrix/lts.json

@@ -0,0 +1 @@
+{"platforms":[{"label":"CentOS-7","provider":"provision::provision_service","image":"centos-7"},{"label":"CentOS-8","provider":"provision::provision_service","image":"centos-8"},{"label":"RedHat-7","provider":"provision::provision_service","image":"rhel-7"},{"label":"Ubuntu-1804","provider":"provision::provision_service","image":"ubuntu-1804-lts"},{"label":"RedHat-8","provider":"provision::provision_service","image":"rhel-8"},{"label":"Sles-12","provider":"provision::provision_service","image":"sles-12"}],"collection":["2019.8.8"]}

templates/tidy_timer.epp

@@ -1,7 +1,6 @@
 <%- | String $service | -%>
 [Unit]
 Description=Timer to tidy Puppet metrics
-Requires=<%= $service %>-tidy.service
 
 [Timer]
 OnCalendar=*-*-* 00:00:00

templates/timer.epp

@@ -1,7 +1,6 @@
 <%- | String $service, String $minute | -%>
 [Unit]
 Description=Timer to collect Puppet metrics
-Requires=<%= $service %>-metrics.service
 
 [Timer]
 OnCalendar=*-*-* *:<%= $minute %>