mirror of
https://github.com/zulip/zulip.git
synced 2025-11-11 09:27:43 +00:00
b0e3191434
The `tidy` parameter is buggy, and ignores all ordering metaparameters. This is fixed in Puppet 7[^1], but it's helpful to resolve it now. Specifically, this fixes bugs with tidy running too early, and deleting the old version of a package before its new version is installed or symlinked, leaving a race condition if anything tries to run the binary in this window. This is mostly not a problem for Supervisor-managed processes, since the binary is already running, and can continue to run if it is tidied out from under the running process. For stand-alone tools like wal-g, which are run frequently by PostgreSQL, this may cause issues if PostgreSQL tries to call them during a puppet run. Remove all complicated uses of tidy, and replace them with an `exec` which does the equivalent. We also generate `file` resources for binaries, making them easier (and clearer) to specify as dependencies. [^1]: https://puppet.atlassian.net/browse/PUP-10688
38 lines
1.0 KiB
Puppet
38 lines
1.0 KiB
Puppet
# @summary Prometheus monitoring of Akamai access logs
|
|
#
|
|
class kandra::prometheus::akamai {
|
|
include kandra::prometheus::base
|
|
include kandra::vector
|
|
include zulip::supervisor
|
|
|
|
$bin = $kandra::vector::bin
|
|
$conf = '/etc/vector.toml'
|
|
$pipelines = {
|
|
'static' => zulipsecret('secrets', 'akamai_static_sqs_url', ''),
|
|
'realm' => zulipsecret('secrets', 'akamai_realm_sqs_url', ''),
|
|
}
|
|
|
|
file { $conf:
|
|
ensure => file,
|
|
owner => 'root',
|
|
group => 'root',
|
|
mode => '0644',
|
|
content => template('kandra/vector.toml.template.erb'),
|
|
}
|
|
file { "${zulip::common::supervisor_conf_dir}/prometheus_akamai_exporter.conf":
|
|
ensure => file,
|
|
require => [
|
|
User[zulip],
|
|
Package[supervisor],
|
|
File['/etc/vector.toml'],
|
|
File[$bin],
|
|
],
|
|
before => Exec['Cleanup vector'],
|
|
owner => 'root',
|
|
group => 'root',
|
|
mode => '0644',
|
|
content => template('kandra/supervisor/conf.d/prometheus_akamai_exporter.conf.template.erb'),
|
|
notify => Service[supervisor],
|
|
}
|
|
}
|