From e00a4c8da1ece535455983203d7bee6aa19bdd6f Mon Sep 17 00:00:00 2001 From: 12ww1160 Date: Mon, 15 Dec 2025 14:09:47 +0100 Subject: [PATCH] OP#263 remove exporter option --- README.md | 4 +++- manifests/exporter/dirs.pp | 21 --------------------- manifests/exporter/files.pp | 12 ------------ manifests/exporter/service.pp | 19 ------------------- manifests/main/config.pp | 3 --- manifests/params.pp | 6 ------ 6 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 manifests/exporter/dirs.pp delete mode 100644 manifests/exporter/files.pp delete mode 100644 manifests/exporter/service.pp diff --git a/README.md b/README.md index 57136cb..75242d9 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/manifests/exporter/dirs.pp b/manifests/exporter/dirs.pp deleted file mode 100644 index 0eaebf5..0000000 --- a/manifests/exporter/dirs.pp +++ /dev/null @@ -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, - } - } -} diff --git a/manifests/exporter/files.pp b/manifests/exporter/files.pp deleted file mode 100644 index 28e9155..0000000 --- a/manifests/exporter/files.pp +++ /dev/null @@ -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 - } -} diff --git a/manifests/exporter/service.pp b/manifests/exporter/service.pp deleted file mode 100644 index befed64..0000000 --- a/manifests/exporter/service.pp +++ /dev/null @@ -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, -# } - } -} diff --git a/manifests/main/config.pp b/manifests/main/config.pp index c61529c..96de299 100644 --- a/manifests/main/config.pp +++ b/manifests/main/config.pp @@ -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 } diff --git a/manifests/params.pp b/manifests/params.pp index 4f03388..07bab13 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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',