devsnack/control-repo
1
0
Fork 0
Code Releases Activity

SVC-1652: Update puppet-profile_monitoring

Browse Source 
Use fqdn for telegraf agent hostname
    Add telegraf_sslcert_check & telegraf_website_check to profile puppet-master
    Add lookup options for profile_monitoring::telegraf::inputs_extra parameters
    Update profile_monitoring to tag v0.1.5
This commit is contained in:
Bill Glick 2021-04-02 09:16:48 -05:00
parent cbafe15949
commit f092060060
No known key found for this signature in database
GPG Key ID: 11F4B27B369F39A4
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Puppetfile
View File

@ -17,7 +17,7 @@ mod 'ncsa/profile_allow_ssh_from_bastion', tag: 'v0.2.1', git: 'https://github.c
mod 'ncsa/profile_dns_cache', tag: 'v1.0.0', git: 'https://github.com/ncsa/puppet-profile_dns_cache' mod 'ncsa/profile_dns_cache', tag: 'v1.0.0', git: 'https://github.com/ncsa/puppet-profile_dns_cache'
# mod 'ncsa/profile_email', tag: 'v0.1.0', git: 'https://github.com/ncsa/puppet-profile_email' # mod 'ncsa/profile_email', tag: 'v0.1.0', git: 'https://github.com/ncsa/puppet-profile_email'
mod 'ncsa/profile_firewall', tag: 'v1.0.1', git: 'https://github.com/ncsa/puppet-profile_firewall' mod 'ncsa/profile_firewall', tag: 'v1.0.1', git: 'https://github.com/ncsa/puppet-profile_firewall'
mod 'ncsa/profile_monitoring', tag: 'v0.1.4', git: 'https://github.com/ncsa/puppet-profile_monitoring' mod 'ncsa/profile_monitoring', tag: 'v0.1.5', git: 'https://github.com/ncsa/puppet-profile_monitoring'
mod 'ncsa/profile_motd', tag: 'v0.1.0', git: 'https://github.com/ncsa/puppet-profile_motd' mod 'ncsa/profile_motd', tag: 'v0.1.0', git: 'https://github.com/ncsa/puppet-profile_motd'
mod 'ncsa/profile_pam_access', tag: 'v0.0.4', git: 'https://github.com/ncsa/puppet-profile_pam_access' mod 'ncsa/profile_pam_access', tag: 'v0.0.4', git: 'https://github.com/ncsa/puppet-profile_pam_access'
mod 'ncsa/profile_puppet_master', tag: 'v0.1.1', git: 'https://github.com/ncsa/puppet-profile_puppet_master' mod 'ncsa/profile_puppet_master', tag: 'v0.1.1', git: 'https://github.com/ncsa/puppet-profile_puppet_master'

9
data/common.yaml
View File

@ -1,5 +1,13 @@
--- ---
lookup_options: lookup_options:
profile_monitoring::telegraf::inputs_extra:
merge:
strategy: "deep"
merge_hash_arrays: true
profile_monitoring::telegraf::input_extra_scripts:
merge:
strategy: "deep"
merge_hash_arrays: true
profile_monitoring::telegraf::outputs: profile_monitoring::telegraf::outputs:
merge: merge:
strategy: "deep" strategy: "deep"
@ -308,6 +316,7 @@ telegraf::agent:
flush_interval: "10s" flush_interval: "10s"
metric_buffer_limit: "100000" metric_buffer_limit: "100000"
telegraf::flush_jitter: "10s" telegraf::flush_jitter: "10s"
telegraf::hostname: "%{::fqdn}"
telegraf::inputs: telegraf::inputs:
cpu: cpu:
percpu: false percpu: false

2
site-modules/role/manifests/puppet_master.pp
View File

@ -5,5 +5,7 @@ class role::puppet_master {
include ::profile::base include ::profile::base
include ::profile_puppet_master include ::profile_puppet_master
include ::profile_monitoring::telegraf_ping_check include ::profile_monitoring::telegraf_ping_check
include ::profile_monitoring::telegraf_sslcert_check
include ::profile_monitoring::telegraf_website_check
} }