Showing with 19 additions and 6 deletions.
  1. +1 −1 .github/workflows/pe_latest_testing.yml
  2. +10 −2 CHANGELOG.md
  3. +3 −0 manifests/init.pp
  4. +1 −1 metadata.json
  5. +3 −1 spec/classes/dashboards_spec.rb
  6. +1 −1 templates/grafana_wait.epp
2 changes: 1 addition & 1 deletion .github/workflows/pe_latest_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Set latest release
id: latest_release
run: |
out=$(jq -c '[.[] | select(.lts == false)][0].latest | {"collection": [.]}' <<<'${{ steps.curl_forge.outputs.forge_response }}')
out=$(jq -c '[.[] | select(.release == "2019.8.x")][0].latest | {"collection": [.]}' <<<'${{ steps.curl_forge.outputs.forge_response }}')
echo "::set-output name=latest::$out"
- name: Setup Acceptance Test Matrix
Expand Down
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@

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

## [v1.3.0](https://github.com/puppetlabs/puppet_operational_dashboards/tree/temp-tag) (2022-09-19)
## [v1.4.0](https://github.com/puppetlabs/puppet_operational_dashboards/tree/v1.4.0) (2022-09-29)

[Full Changelog](https://github.com/puppetlabs/puppet_operational_dashboards/compare/v1.2.0...temp-tag)
[Full Changelog](https://github.com/puppetlabs/puppet_operational_dashboards/compare/v1.3.0...v1.4.0)

### Added

- Pass use\_ssl param to InfluxDB resources [\#84](https://github.com/puppetlabs/puppet_operational_dashboards/pull/84) ([m0dular](https://github.com/m0dular))

## [v1.3.0](https://github.com/puppetlabs/puppet_operational_dashboards/tree/v1.3.0) (2022-09-19)

[Full Changelog](https://github.com/puppetlabs/puppet_operational_dashboards/compare/v1.2.0...v1.3.0)

### Added

Expand Down
3 changes: 3 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@

influxdb_org { $initial_org:
ensure => present,
use_ssl => $use_ssl,
token => $influxdb_token,
require => Class['influxdb'],
token_file => $influxdb_token_file,
}
influxdb_bucket { $initial_bucket:
ensure => present,
use_ssl => $use_ssl,
org => $initial_org,
token => $influxdb_token,
require => [Class['influxdb'], Influxdb_org[$initial_org]],
Expand All @@ -89,6 +91,7 @@
# i.e. it takes two agent runs to become available
influxdb_auth { $telegraf_token_name:
ensure => present,
use_ssl => $use_ssl,
org => $initial_org,
token => $influxdb_token,
token_file => $influxdb_token_file,
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-puppet_operational_dashboards",
"version": "1.3.0",
"version": "1.4.0",
"author": "Adrian Parreiras Horta",
"summary": "A module for managing the installation and configuration of metrics dashboards for Puppet Infrastructure.",
"license": "Apache-2.0",
Expand Down
4 changes: 3 additions & 1 deletion spec/classes/dashboards_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
end

is_expected.to contain_file('grafana-conf-d')
is_expected.to contain_file('wait-for-grafana').with_content(%r{ExecStartPost=/usr/bin/timeout 10 sh -c 'while ! ss -H -t -l -n sport = :3000 | grep -q "^LISTEN.*:3000"; do sleep 1; done'})
is_expected.to contain_file('wait-for-grafana').with_content(
%r{ExecStartPost=/usr/bin/timeout 10 sh -c 'while ! ss -t -l -n sport = :3000 | sed 1d | grep -q "^LISTEN.*:3000"; do sleep 1; done'},
)
is_expected.to contain_file('wait-for-grafana').that_subscribes_to('Exec[puppet_grafana_daemon_reload]')

is_expected.to contain_exec('puppet_grafana_daemon_reload').that_notifies('Service[grafana-server]')
Expand Down
2 changes: 1 addition & 1 deletion templates/grafana_wait.epp
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# Adapted from https://unix.stackexchange.com/a/584965/226625
# Wait for the service to be listening on port 3000
[Service]
ExecStartPost=/usr/bin/timeout <%= $timeout %> sh -c 'while ! ss -H -t -l -n sport = :3000 | grep -q "^LISTEN.*:3000"; do sleep 1; done'
ExecStartPost=/usr/bin/timeout <%= $timeout %> sh -c 'while ! ss -t -l -n sport = :3000 | sed 1d | grep -q "^LISTEN.*:3000"; do sleep 1; done'