promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
7 changed files with 30 additions and 3 deletions
Showing only changes of commit a21b7ffc96 - Show all commits

View File

@ -23,6 +23,7 @@ mod 'puppet-chrony', '2.6.0'
mod 'puppet-puppetboard', '9.0.0' mod 'puppet-puppetboard', '9.0.0'
mod 'puppet-nginx', '5.0.0' mod 'puppet-nginx', '5.0.0'
mod 'puppet-selinux', '4.1.0' mod 'puppet-selinux', '4.1.0'
mod 'puppet-prometheus', '13.4.0'
# other # other
mod 'ghoneycutt-puppet', '3.3.0' mod 'ghoneycutt-puppet', '3.3.0'

View File

@ -35,6 +35,9 @@ profiles::puppet::client::runtimeout: 3600
profiles::puppet::client::show_diff: true profiles::puppet::client::show_diff: true
profiles::puppet::client::usecacheonfailure: false profiles::puppet::client::usecacheonfailure: false
prometheus::node_exporter::export_scrape_job: true
prometheus::systemd_exporter::export_scrape_job: true
profiles::accounts::sysadmin::sshkeys: profiles::accounts::sysadmin::sshkeys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZ8SRLlPiDylBpdWR9LpvPg4fDVD+DZst4yRPFwMMhta4mnB1H9XuvZkptDhXywWQ7QIcqa2WbhCen0OQJCtwn3s7EYtacmF5MxmwBYocPoK2AArGuh6NA9rwTdLrPdzhZ+gwe88PAzRLNzjm0ZBR+mA9saMbPJdqpKp0AWeAM8QofRQAWuCzQg9i0Pn1KDMvVDRHCZof4pVlHSTyHNektq4ifovn0zhKC8jD/cYu95mc5ftBbORexpGiQWwQ3HZw1IBe0ZETB1qPIPwsoJpt3suvMrL6T2//fcIIUE3TcyJKb/yhztja4TZs5jT8370G/vhlT70He0YPxqHub8ZfBv0khlkY93VBWYpNGJwM1fVqlw7XbfBNdOuJivJac8eW317ZdiDnKkBTxapThpPG3et9ib1HoPGKRsd/fICzNz16h2R3tddSdihTFL+bmTCa6Lo+5t5uRuFjQvhSLSgO2/gRAprc3scYOB4pY/lxOFfq3pU2VvSJtRgLNEYMUYKk= ben@unkin.net - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZ8SRLlPiDylBpdWR9LpvPg4fDVD+DZst4yRPFwMMhta4mnB1H9XuvZkptDhXywWQ7QIcqa2WbhCen0OQJCtwn3s7EYtacmF5MxmwBYocPoK2AArGuh6NA9rwTdLrPdzhZ+gwe88PAzRLNzjm0ZBR+mA9saMbPJdqpKp0AWeAM8QofRQAWuCzQg9i0Pn1KDMvVDRHCZof4pVlHSTyHNektq4ifovn0zhKC8jD/cYu95mc5ftBbORexpGiQWwQ3HZw1IBe0ZETB1qPIPwsoJpt3suvMrL6T2//fcIIUE3TcyJKb/yhztja4TZs5jT8370G/vhlT70He0YPxqHub8ZfBv0khlkY93VBWYpNGJwM1fVqlw7XbfBNdOuJivJac8eW317ZdiDnKkBTxapThpPG3et9ib1HoPGKRsd/fICzNz16h2R3tddSdihTFL+bmTCa6Lo+5t5uRuFjQvhSLSgO2/gRAprc3scYOB4pY/lxOFfq3pU2VvSJtRgLNEYMUYKk= ben@unkin.net

View File

@ -0,0 +1,2 @@
---
prometheus::bind_exporter::export_scrape_job: true

View File

@ -29,6 +29,7 @@ class profiles::base (
include profiles::base::hosts include profiles::base::hosts
include profiles::accounts::sysadmin include profiles::accounts::sysadmin
include profiles::ntp::client include profiles::ntp::client
include profiles::metrics::default
# configure dns records for client # configure dns records for client
profiles::dns::client {"${facts['networking']['fqdn']}-default":} profiles::dns::client {"${facts['networking']['fqdn']}-default":}

View File

@ -17,11 +17,15 @@ class profiles::dns::server (
# setup base bind server # setup base bind server
class { 'bind': class { 'bind':
forwarders => $use_forwarders, forwarders => $use_forwarders,
dnssec => $dnssec, dnssec => $dnssec,
version => 'Controlled by Puppet', version => 'Controlled by Puppet',
statistics_port => '8053',
} }
# setup bind_exporter
include prometheus::bind_exporter
# if keys, import them # if keys, import them
$keys.each | $name, $data | { $keys.each | $name, $data | {
bind::key { $name: bind::key { $name:

View File

@ -0,0 +1,11 @@
# profiles::metrics::default
#
# these exporters will be setup on all nodes
class profiles::metrics::default (
Boolean $node_exporter = true,
Boolean $systemd_exporter = true,
) {
include prometheus::node_exporter
include prometheus::systemd_exporter
}

View File

@ -13,4 +13,9 @@ class profiles::puppet::puppetdb_api (
contain ::puppetdb::server contain ::puppetdb::server
class { 'prometheus::puppetdb_exporter':
puppetdb_url => "http://${listen_address}:8080/pdb/query",
export_scrape_job => true,
}
} }