From fa6c7e487efdb6d6341d02ace6ed7817bbea6c38 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 21 Nov 2025 16:37:49 +0100 Subject: [PATCH 1/2] troubleshooting --- templates/postgresql.conf.erb | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/templates/postgresql.conf.erb b/templates/postgresql.conf.erb index 49e10c8..7debf65 100644 --- a/templates/postgresql.conf.erb +++ b/templates/postgresql.conf.erb @@ -60,14 +60,6 @@ listen_addresses = '<%= @pl_listen_address %>' port = <%= @pl_listen_port %> max_connections = <%= @pl_max_conn %> - -# - Shared Library Preloading - -<% if @pl_manage_extensions == true -%> -shared_preload_libraries = '<%= @pl_reqpackages_extensions %>' -<% else -%> -# shared_preload_libraries = '' -<% end -%> - #superuser_reserved_connections = 3 # (change requires restart) #unix_socket_directories = '/var/run/postgresql, /tmp' # comma-separated list of directories # (change requires restart) @@ -101,6 +93,17 @@ shared_preload_libraries = '<%= @pl_reqpackages_extensions %>' #krb_server_keyfile = 'FILE:${sysconfdir}/krb5.keytab' #krb_caseins_users = off +# - Shared Library Preloading - +<% if @pl_manage_extensions == true -%> +shared_preload_libraries = '<%= @pl_reqpackages_extensions %>' +<% else -%> +# shared_preload_libraries = '' +<% end -%> +#local_preload_libraries = '' +#session_preload_libraries = '' +#jit_provider = 'llvmjit' # JIT library to use + + # - SSL - <% if @pl_ssl_enabled == true -%> @@ -712,10 +715,6 @@ lc_time = 'en_US.UTF-8' # locale for time formatting # default configuration for text search default_text_search_config = 'pg_catalog.english' -#local_preload_libraries = '' -#session_preload_libraries = '' -#jit_provider = 'llvmjit' # JIT library to use - # - Other Defaults - #dynamic_library_path = '$libdir' From 05ad100b0e1b17df4735fc29a935ebaf06d55763 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Nov 2025 16:39:14 +0100 Subject: [PATCH 2/2] Recommit for updates in build 49 --- doc/_index.html | 15 ++ doc/puppet_class_list.html | 39 +++-- ...postgresql_cd_3A_3Aexporter_3A_3Adirs.html | 152 ++++++++++++++++++ ...ostgresql_cd_3A_3Aexporter_3A_3Afiles.html | 134 +++++++++++++++ ...tgresql_cd_3A_3Aexporter_3A_3Aservice.html | 148 +++++++++++++++++ .../postgresql_cd_3A_3Amain_3A_3Aconfig.html | 8 +- .../postgresql_cd_3A_3Amain_3A_3Ainstall.html | 12 +- .../postgresql_cd_3A_3Aparams.html | 110 +++++++++++-- 8 files changed, 598 insertions(+), 20 deletions(-) create mode 100644 doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Adirs.html create mode 100644 doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Afiles.html create mode 100644 doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Aservice.html diff --git a/doc/_index.html b/doc/_index.html index 1f9f481..db9fc5c 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,6 +73,21 @@ +
  • + postgresql_cd::exporter::dirs + +
    • + +
  • + postgresql_cd::exporter::files + +
    • + +
  • + postgresql_cd::exporter::service + +
    • +
  • postgresql_cd::firewall::iptables diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 5dc8563..37b3ef4 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -47,63 +47,84 @@
    • -
  • +
  • +
    + postgresql_cd::exporter::dirs +
    +
    • + + +
  • +
    + postgresql_cd::exporter::files +
    +
    • + + +
  • +
    + postgresql_cd::exporter::service +
    +
    • + + +
  • postgresql_cd::firewall::iptables
    • -
  • +
  • postgresql_cd::main::config
    • -
  • +
  • postgresql_cd::main::dirs
    • -
  • +
  • postgresql_cd::main::files
    • -
  • +
  • postgresql_cd::main::install
    • -
  • +
  • postgresql_cd::params
    • -
  • +
  • postgresql_cd::server::initdb
    • -
  • +
  • postgresql_cd::server::pghba::pg_hba
    • -
  • +
  • postgresql_cd::server::service
    diff --git a/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Adirs.html b/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Adirs.html new file mode 100644 index 0000000..7b73a71 --- /dev/null +++ b/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Adirs.html @@ -0,0 +1,152 @@ + + + + + + + Puppet Class: postgresql_cd::exporter::dirs + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: postgresql_cd::exporter::dirs

    +
    + +
    +
    Inherits:
    +
    postgresql_cd::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/exporter/dirs.pp +
    +
    +
    + +

    Summary

    + Class manages the postgresql exporter dirs + +

    Overview

    +
    +
    + +

    postgresql_cd::exporter::dirs.pp Module name: postgresql_cd Author: Arne Teuke (arne_teuke@confdroid.com)

    + +
    +
    + + + +
    + + + +
    + + + + + +
    + 
    +
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
    +     		+ 
    # File 'manifests/exporter/dirs.pp', line 6
+
+class postgresql_cd::exporter::dirs (
+
+) inherits postgresql_cd::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,
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file diff --git a/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Afiles.html b/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Afiles.html new file mode 100644 index 0000000..5be9842 --- /dev/null +++ b/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Afiles.html @@ -0,0 +1,134 @@ + + + + + + + Puppet Class: postgresql_cd::exporter::files + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: postgresql_cd::exporter::files

    +
    + +
    +
    Inherits:
    +
    postgresql_cd::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/exporter/files.pp +
    +
    +
    + +

    Summary

    + Class manages the postgresql exporter files + +

    Overview

    +
    +
    + +

    postgresql_cd::exporter::files.pp Module name: postgresql_cd Author: Arne Teuke (arne_teuke@confdroid.com)

    + +
    +
    + + + +
    + + + +
    + + + + + +
    + 
    +
+
+6
+7
+8
+9
+10
+11
+12
    +     		+ 
    # File 'manifests/exporter/files.pp', line 6
+
+class postgresql_cd::exporter::files (
+
+) inherits postgresql_cd::params {
+  if ($fqdn == $pl_server_fqdn) and ($pl_use_exporter == true) {
+    require postgresql_cd::exporter::dirs
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file diff --git a/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Aservice.html b/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Aservice.html new file mode 100644 index 0000000..2812c7d --- /dev/null +++ b/doc/puppet_classes/postgresql_cd_3A_3Aexporter_3A_3Aservice.html @@ -0,0 +1,148 @@ + + + + + + + Puppet Class: postgresql_cd::exporter::service + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: postgresql_cd::exporter::service

    +
    + +
    +
    Inherits:
    +
    postgresql_cd::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/exporter/service.pp +
    +
    +
    + +

    Summary

    + Class manages the postgresql exporter service + +

    Overview

    +
    +
    + +

    postgresql_cd::exporter::service.pp Module name: postgresql_cd Author: Arne Teuke (arne_teuke@confdroid.com)

    + +
    +
    + + + +
    + + + +
    + + + + + +
    + 
    +
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
    +     		+ 
    # File 'manifests/exporter/service.pp', line 6
+
+class postgresql_cd::exporter::service (
+
+) inherits postgresql_cd::params {
+  if ($fqdn == $pl_server_fqdn) and ($pl_use_exporter == true) {
+    require postgresql_cd::exporter::files
+
+#    service { $pl_exporter_service:
+#      ensure     => running,
+#      hasstatus  => true,
+#      hasrestart => true,
+#      enable     => true,
+#    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file diff --git a/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html index 7f0955f..b59f5c2 100644 --- a/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html @@ -109,7 +109,10 @@ 11 12 13 -14 +14 +15 +16 +17 
    # File 'manifests/main/config.pp', line 6
@@ -121,6 +124,9 @@ class postgresql_cd::main::config (
 
   if $fqdn == $pl_server_fqdn {
     include postgresql_cd::server::service
+#    if $pl_use_exporter == true {
+#      include postgresql_cd::exporter::service
+#    }
   }
 }
    diff --git a/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Ainstall.html index bf4d9b1..15d0269 100644 --- a/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Ainstall.html @@ -118,7 +118,12 @@ 20 21 22 -23 +23 +24 +25 +26 +27 +28 
    # File 'manifests/main/install.pp', line 6
@@ -133,6 +138,11 @@ class postgresql_cd::main::install (
     package { $reqpackages_client:
       ensure => $pkg_ensure,
     }
+    if $pl_manage_extensions == true {
+      package { $reqpackages_extensions:
+        ensure => $pkg_ensure,
+      }
+    }
   }
 
   if $fqdn != $pl_server_fqdn {
diff --git a/doc/puppet_classes/postgresql_cd_3A_3Aparams.html b/doc/puppet_classes/postgresql_cd_3A_3Aparams.html
index 88756e7..da24fd0 100644
--- a/doc/puppet_classes/postgresql_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/postgresql_cd_3A_3Aparams.html
@@ -75,10 +75,16 @@
       
       postgresql_cd::main::install
    
       
+      postgresql_cd::exporter::dirs
    
+      
       postgresql_cd::server::initdb
    
       
+      postgresql_cd::exporter::files
    
+      
       postgresql_cd::server::service
    
       
+      postgresql_cd::exporter::service
    
+      
       postgresql_cd::firewall::iptables
    
       
       postgresql_cd::server::pghba::pg_hba
    
@@ -148,6 +154,24 @@
    • +
  • + + reqpackages_extensions + + + (Array) + + + (defaults to: ['pg_stat_statements','timescaledb']) + + + — +
    +

    the packages for extensions

    +
    + +
    • +
  • reqpackages_client @@ -396,6 +420,60 @@ —

    whether to manage roles and databases

    +
    + +
    • + +
  • + + pl_manage_extensions + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to manage extensions

    +
    + +
    • + +
  • + + pl_use_exporter + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to use the postgresql-exporter

    +
    + +
    • + +
  • + + pl_install_dir + + + (String) + + + (defaults to: '/opt/postgres-exporter') + + + — +
    +

    the path for the postgres-exporter files

    • @@ -411,10 +489,6 @@ 
     
 
-24
-25
-26
-27
 28
 29
 30
@@ -455,10 +529,21 @@
 65
 66
 67
-68
    +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 - 
    # File 'manifests/params.pp', line 24
+        
    # File 'manifests/params.pp', line 28
 
 class postgresql_cd::params (
 
@@ -466,6 +551,7 @@ class postgresql_cd::params (
 
   # installation
   Array $reqpackages_server       = ['postgresql-server','postgresql-contrib'],
+  Array $reqpackages_extensions   = ['pg_stat_statements','timescaledb'],
   String $reqpackages_client      = 'postgresql',
   String $pkg_ensure              = 'latest',
 
@@ -484,6 +570,11 @@ class postgresql_cd::params (
   String $pl_server_key           = 'server.key',
   String $pl_ca_crt               = 'root.crt',
   Boolean $pl_manage_content      = true,
+  Boolean $pl_manage_extensions   = false,
+
+  # postgresql exporter
+  Boolean $pl_use_exporter        = false,
+  String $pl_install_dir          = '/opt/postgres-exporter',
 
 ) {
   $fqdn                     = $facts['networking']['fqdn']
@@ -491,9 +582,6 @@ class postgresql_cd::params (
   $os_name                  = $facts['os']['name']
   $os_release               = $facts['os']['release']['major']
 
-  # Service
-  $pl_service               = 'postgresql'
-
   # Directories
   $pl_data_dir              = '/var/lib/pgsql/data/'
 
@@ -502,6 +590,10 @@ class postgresql_cd::params (
   $pl_pg_hba_rule_conf      = 'postgresql_cd/server/pghba/pg_hba_rule.conf.erb'
   $pl_pg_hba_conf_erb       = 'postgresql_cd/server/pghba/pg_hba.conf.erb'
 
+  # Service
+  $pl_service               = 'postgresql'
+  $pl_exporter_service      = 'postgres_exporter'
+
   # includes must be last
   include postgresql_cd::main::config
 }