3
0

OP#263 remove exporter option

This commit is contained in:
12ww1160
2025-12-15 14:09:47 +01:00
parent a59dc28728
commit e00a4c8da1
6 changed files with 3 additions and 62 deletions

View File

@@ -83,8 +83,10 @@ All files and directories are configured with correct selinux context. If selinu
## Support
This module has been developed for and tested with
* OS: Rocky 9
* Puppet 6 - 8
* Puppet 8
## Tests

View File

@@ -1,21 +0,0 @@
## confdroid_postgresql::exporter::dirs.pp
# Module name: confdroid_postgresql
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class manages the postgresql exporter dirs
###############################################################################
class confdroid_postgresql::exporter::dirs (
) inherits confdroid_postgresql::params {
if ($fqdn == $pl_server_fqdn) and ($pl_use_exporter == true) {
file { $pl_install_dir:
ensure => directory,
owner => 'postgres',
group => 'postgres',
mode => '0755',
selrange => s0,
selrole => object_r,
seltype => usr_t,
seluser => system_u,
}
}
}

View File

@@ -1,12 +0,0 @@
## confdroid_postgresql::exporter::files.pp
# Module name: confdroid_postgresql
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class manages the postgresql exporter files
###############################################################################
class confdroid_postgresql::exporter::files (
) inherits confdroid_postgresql::params {
if ($fqdn == $pl_server_fqdn) and ($pl_use_exporter == true) {
require confdroid_postgresql::exporter::dirs
}
}

View File

@@ -1,19 +0,0 @@
## confdroid_postgresql::exporter::service.pp
# Module name: confdroid_postgresql
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class manages the postgresql exporter service
###############################################################################
class confdroid_postgresql::exporter::service (
) inherits confdroid_postgresql::params {
if ($fqdn == $pl_server_fqdn) and ($pl_use_exporter == true) {
require confdroid_postgresql::exporter::files
# service { $pl_exporter_service:
# ensure => running,
# hasstatus => true,
# hasrestart => true,
# enable => true,
# }
}
}

View File

@@ -10,9 +10,6 @@ class confdroid_postgresql::main::config (
if $fqdn == $pl_server_fqdn {
include confdroid_postgresql::server::service
if $pl_use_exporter == true {
include confdroid_postgresql::exporter::service
}
if $pl_use_pg_bouncer == true {
include confdroid_postgresql::bouncer::service
}

View File

@@ -23,8 +23,6 @@
# @param [String] pl_ca_crt the name of the CA crt
# @param [Boolean] pl_manage_content whether to manage roles and databases
# @param [Boolean] pl_manage_extensions whether to manage extensions
# @param [Boolean] pl_use_exporter whether to use the postgresql-exporter
# @param [String] pl_install_dir the path for the postgres-exporter files
# @param [String] pl_idle_timeout idle_in_transaction_session_timeout
# @param [Boolean] pl_use_pg_bouncer whether to use the pc_bouncer
# @param [String] pl_bouncer_listen_addr bouncer listen address
@@ -64,10 +62,6 @@ class confdroid_postgresql::params (
Boolean $pl_manage_content = true,
Boolean $pl_manage_extensions = false,
# postgresql exporter
Boolean $pl_use_exporter = false,
String $pl_install_dir = '/opt/postgres-exporter',
# pg bouncer
Boolean $pl_use_pg_bouncer = false,
String $pl_bouncer_listen_addr = '0.0.0.0',