Showing with 45 additions and 39 deletions.
  1. +6 −2 .devcontainer/README.md
  2. +10 −0 CHANGELOG.md
  3. +20 −15 Gemfile
  4. +6 −18 lib/facter/pe_status_check.rb
  5. +3 −3 metadata.json
  6. +0 −1 spec/default_facts.yml
8 changes: 6 additions & 2 deletions .devcontainer/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp

// Set *default* container specific settings.json values on container create.
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
"terminal.integrated.profiles.linux": {
"bash": {
"path": "bash",
}
}
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"puppet.puppet-vscode",
"rebornix.Ruby"
]
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [],
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

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).

## [v2.4.1](https://github.com/puppetlabs/puppetlabs-pe_status_check/tree/v2.4.1) (2022-10-14)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-pe_status_check/compare/v2.4.0...v2.4.1)

### Fixed

- \(SUP-3724\) error handling for access log parsing [\#167](https://github.com/puppetlabs/puppetlabs-pe_status_check/pull/167) ([MartyEwings](https://github.com/MartyEwings))
- \(Sup-3700\) Handle missing licence type [\#165](https://github.com/puppetlabs/puppetlabs-pe_status_check/pull/165) ([MartyEwings](https://github.com/MartyEwings))
- Remove duplicate Chunks [\#164](https://github.com/puppetlabs/puppetlabs-pe_status_check/pull/164) ([MartyEwings](https://github.com/MartyEwings))

## [v2.4.0](https://github.com/puppetlabs/puppetlabs-pe_status_check/tree/v2.4.0) (2022-09-29)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-pe_status_check/compare/v2.3.1...v2.4.0)
Expand Down
35 changes: 20 additions & 15 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,29 @@ def location_for(place_or_version, fake_version = nil)
end
end

ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
minor_version = ruby_version_segments[0..1].join('.')

group :development do
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false, platforms: [:ruby]
gem "github_changelog_generator", require: false
gem "octokit", '= 4.21.0', require: false
gem "json", '~> 2.0', require: false
gem "voxpupuli-puppet-lint-plugins", '~> 3.0', require: false
gem "facterdb", '~> 1.18', require: false
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
gem "rspec-puppet-facts", '~> 2.0', require: false
gem "codecov", '~> 0.2', require: false
gem "dependency_checker", '~> 0.2', require: false
gem "parallel_tests", '~> 3.4', require: false
gem "pry", '~> 0.10', require: false
gem "simplecov-console", '~> 0.5', require: false
gem "puppet-debugger", '~> 1.0', require: false
gem "rubocop", '= 1.6.1', require: false
gem "rubocop-performance", '= 1.9.1', require: false
gem "rubocop-rspec", '= 2.0.1', require: false
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "github_changelog_generator", require: false
gem "octokit", '= 4.21.0', require: false
end
group :system_tests do
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
gem "serverspec", '~> 2.41', require: false
end

puppet_version = ENV['PUPPET_GEM_VERSION']
Expand Down
24 changes: 6 additions & 18 deletions lib/facter/pe_status_check.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,9 @@
if File.exist?(license_file)
begin
license_type = File.readlines(license_file).grep(%r{license_type:}).first
if license_type.include? 'Perpetual'
if license_type.nil?
validity = true
elsif license_type.include? 'Perpetual'
validity = true
elsif license_type.include? 'Subscription'
require 'date'
Expand Down Expand Up @@ -393,23 +395,6 @@
{ S0033: hiera_config_file.dig('version') == 5 }
end

chunk(:S0036) do
next unless ['primary', 'legacy_primary', 'replica', 'pe_compiler', 'legacy_compiler'].include?(Facter.value('pe_status_check_role'))

str = IO.read('/etc/puppetlabs/puppetserver/conf.d/pe-puppet-server.conf')
max_queued_requests = str.match(%r{max-queued-requests: (\d+)})
if max_queued_requests.nil?
{ S0036: true }
else
{ S0036: max_queued_requests[1].to_i < 150 }
end
end

chunk(:S0040) do
# Is puppet_metrics_collector::system configured
{ S0040: PEStatusCheck.service_running_enabled('puppet_system_processes-metrics.timer') }
end

chunk(:S0034) do
next unless ['primary', 'legacy_primary'].include?(Facter.value('pe_status_check_role'))

Expand Down Expand Up @@ -479,6 +464,9 @@
current = since_lastrun.to_i <= Puppet.settings['runinterval']

match[:status] == '503' and current
rescue StandardError => e
Facter.warn("Error in fact 'pe_status_check.S0039' when querying puppetserver access logs: #{e.message}")
Facter.debug(e.backtrace)
end

{ S0039: !has_503 }
Expand Down
6 changes: 3 additions & 3 deletions metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-pe_status_check",
"version": "2.4.0",
"version": "2.4.1",
"author": "Marty Ewings",
"summary": "A Puppet Enterprise Module to Promote Preventative Maintenance and Self Service",
"license": "Apache-2.0",
Expand Down Expand Up @@ -81,7 +81,7 @@
"version_requirement": ">= 6.16.0 < 8.0.0"
}
],
"pdk-version": "2.4.0",
"pdk-version": "2.5.0",
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
"template-ref": "heads/main-0-g806810b"
"template-ref": "tags/2.6.0-0-gd0490b9"
}
1 change: 0 additions & 1 deletion spec/default_facts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ is_pe: false
macaddress: "AA:AA:AA:AA:AA:AA"
pe_build: 2021.4.0
common_appdata: 'C:/ProgramData'