Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete database config options #357

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Remove obsolete database config options #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9866159
Remove obsolete database config options
smokris Aug 9, 2022
9b1bbcd
Resolving linting errors
klab-systems Feb 16, 2024
2ccdaa7
update reference doc
klab-systems Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 0 additions & 112 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ The following parameters are available in the `puppetdb` class:
* [`facts_blacklist`](#-puppetdb--facts_blacklist)
* [`gc_interval`](#-puppetdb--gc_interval)
* [`node_purge_gc_batch_limit`](#-puppetdb--node_purge_gc_batch_limit)
* [`log_slow_statements`](#-puppetdb--log_slow_statements)
* [`conn_max_age`](#-puppetdb--conn_max_age)
* [`conn_keep_alive`](#-puppetdb--conn_keep_alive)
* [`conn_lifetime`](#-puppetdb--conn_lifetime)
* [`puppetdb_package`](#-puppetdb--puppetdb_package)
* [`puppetdb_service`](#-puppetdb--puppetdb_service)
Expand All @@ -122,9 +120,7 @@ The following parameters are available in the `puppetdb` class:
* [`read_database_jdbc_ssl_properties`](#-puppetdb--read_database_jdbc_ssl_properties)
* [`read_database_validate`](#-puppetdb--read_database_validate)
* [`read_database_name`](#-puppetdb--read_database_name)
* [`read_log_slow_statements`](#-puppetdb--read_log_slow_statements)
* [`read_conn_max_age`](#-puppetdb--read_conn_max_age)
* [`read_conn_keep_alive`](#-puppetdb--read_conn_keep_alive)
* [`read_conn_lifetime`](#-puppetdb--read_conn_lifetime)
* [`ssl_dir`](#-puppetdb--ssl_dir)
* [`ssl_set_cert_paths`](#-puppetdb--ssl_set_cert_paths)
Expand Down Expand Up @@ -457,20 +453,6 @@ Nodes will be purged in batches of this size, one batch per gc-interval.

Default value: `$puppetdb::params::node_purge_gc_batch_limit`

##### <a name="-puppetdb--log_slow_statements"></a>`log_slow_statements`

Data type: `Any`

This sets the number of seconds before an SQL query is considered "slow." Slow
SQL queries are logged as warnings, to assist in debugging and tuning. Note
PuppetDB does not interrupt slow queries; it simply reports them after they
complete.

The default value is `10` seconds. A value of 0 will disable logging of slow
queries. This option is supported in PuppetDB >= 1.1.

Default value: `$puppetdb::params::log_slow_statements`

##### <a name="-puppetdb--conn_max_age"></a>`conn_max_age`

Data type: `Any`
Expand All @@ -482,18 +464,6 @@ If not supplied, we default to `60` minutes. This option is supported in PuppetD

Default value: `$puppetdb::params::conn_max_age`

##### <a name="-puppetdb--conn_keep_alive"></a>`conn_keep_alive`

Data type: `Any`

This sets the time (in minutes) for a connection to remain idle before sending
a test query to the DB. This is useful to prevent a DB from timing out
connections on its end.

If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.1.

Default value: `$puppetdb::params::conn_keep_alive`

##### <a name="-puppetdb--conn_lifetime"></a>`conn_lifetime`

Data type: `Any`
Expand Down Expand Up @@ -690,20 +660,6 @@ the `database_name` parameter. This option is supported in PuppetDB >= 1.6.

Default value: `$puppetdb::params::read_database_name`

##### <a name="-puppetdb--read_log_slow_statements"></a>`read_log_slow_statements`

Data type: `Any`

This sets the number of seconds before an SQL query to the read database is
considered "slow." Slow SQL queries are logged as warnings, to assist in
debugging and tuning. Note PuppetDB does not interrupt slow queries; it simply
reports them after they complete.

The default value is 10 seconds. A value of 0 will disable logging of slow
queries. This option is supported in PuppetDB >= 1.6.

Default value: `$puppetdb::params::read_log_slow_statements`

##### <a name="-puppetdb--read_conn_max_age"></a>`read_conn_max_age`

Data type: `Any`
Expand All @@ -715,18 +671,6 @@ If not supplied, we default to 60 minutes. This option is supported in PuppetDB

Default value: `$puppetdb::params::read_conn_max_age`

##### <a name="-puppetdb--read_conn_keep_alive"></a>`read_conn_keep_alive`

Data type: `Any`

This sets the time (in minutes) for a read database connection to remain idle
before sending a test query to the DB. This is useful to prevent a DB from
timing out connections on its end.

If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.6.

Default value: `$puppetdb::params::read_conn_keep_alive`

##### <a name="-puppetdb--read_conn_lifetime"></a>`read_conn_lifetime`

Data type: `Any`
Expand Down Expand Up @@ -1427,9 +1371,7 @@ The following parameters are available in the `puppetdb::server` class:
* [`facts_blacklist`](#-puppetdb--server--facts_blacklist)
* [`gc_interval`](#-puppetdb--server--gc_interval)
* [`node_purge_gc_batch_limit`](#-puppetdb--server--node_purge_gc_batch_limit)
* [`log_slow_statements`](#-puppetdb--server--log_slow_statements)
* [`conn_max_age`](#-puppetdb--server--conn_max_age)
* [`conn_keep_alive`](#-puppetdb--server--conn_keep_alive)
* [`conn_lifetime`](#-puppetdb--server--conn_lifetime)
* [`puppetdb_package`](#-puppetdb--server--puppetdb_package)
* [`puppetdb_service`](#-puppetdb--server--puppetdb_service)
Expand All @@ -1449,9 +1391,7 @@ The following parameters are available in the `puppetdb::server` class:
* [`read_database_jdbc_ssl_properties`](#-puppetdb--server--read_database_jdbc_ssl_properties)
* [`read_database_validate`](#-puppetdb--server--read_database_validate)
* [`read_database_name`](#-puppetdb--server--read_database_name)
* [`read_log_slow_statements`](#-puppetdb--server--read_log_slow_statements)
* [`read_conn_max_age`](#-puppetdb--server--read_conn_max_age)
* [`read_conn_keep_alive`](#-puppetdb--server--read_conn_keep_alive)
* [`read_conn_lifetime`](#-puppetdb--server--read_conn_lifetime)
* [`ssl_dir`](#-puppetdb--server--ssl_dir)
* [`ssl_set_cert_paths`](#-puppetdb--server--ssl_set_cert_paths)
Expand Down Expand Up @@ -1715,20 +1655,6 @@ Nodes will be purged in batches of this size, one batch per gc-interval.

Default value: `$puppetdb::params::node_purge_gc_batch_limit`

##### <a name="-puppetdb--server--log_slow_statements"></a>`log_slow_statements`

Data type: `Any`

This sets the number of seconds before an SQL query is considered "slow." Slow
SQL queries are logged as warnings, to assist in debugging and tuning. Note
PuppetDB does not interrupt slow queries; it simply reports them after they
complete.

The default value is `10` seconds. A value of 0 will disable logging of slow
queries. This option is supported in PuppetDB >= 1.1.

Default value: `$puppetdb::params::log_slow_statements`

##### <a name="-puppetdb--server--conn_max_age"></a>`conn_max_age`

Data type: `Any`
Expand All @@ -1740,18 +1666,6 @@ If not supplied, we default to `60` minutes. This option is supported in PuppetD

Default value: `$puppetdb::params::conn_max_age`

##### <a name="-puppetdb--server--conn_keep_alive"></a>`conn_keep_alive`

Data type: `Any`

This sets the time (in minutes) for a connection to remain idle before sending
a test query to the DB. This is useful to prevent a DB from timing out
connections on its end.

If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.1.

Default value: `$puppetdb::params::conn_keep_alive`

##### <a name="-puppetdb--server--conn_lifetime"></a>`conn_lifetime`

Data type: `Any`
Expand Down Expand Up @@ -1940,20 +1854,6 @@ the `database_name` parameter. This option is supported in PuppetDB >= 1.6.

Default value: `$puppetdb::params::read_database_name`

##### <a name="-puppetdb--server--read_log_slow_statements"></a>`read_log_slow_statements`

Data type: `Any`

This sets the number of seconds before an SQL query to the read database is
considered "slow." Slow SQL queries are logged as warnings, to assist in
debugging and tuning. Note PuppetDB does not interrupt slow queries; it simply
reports them after they complete.

The default value is 10 seconds. A value of 0 will disable logging of slow
queries. This option is supported in PuppetDB >= 1.6.

Default value: `$puppetdb::params::read_log_slow_statements`

##### <a name="-puppetdb--server--read_conn_max_age"></a>`read_conn_max_age`

Data type: `Any`
Expand All @@ -1965,18 +1865,6 @@ If not supplied, we default to 60 minutes. This option is supported in PuppetDB

Default value: `$puppetdb::params::read_conn_max_age`

##### <a name="-puppetdb--server--read_conn_keep_alive"></a>`read_conn_keep_alive`

Data type: `Any`

This sets the time (in minutes) for a read database connection to remain idle
before sending a test query to the DB. This is useful to prevent a DB from
timing out connections on its end.

If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.6.

Default value: `$puppetdb::params::read_conn_keep_alive`

##### <a name="-puppetdb--server--read_conn_lifetime"></a>`read_conn_lifetime`

Data type: `Any`
Expand Down
40 changes: 0 additions & 40 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,28 +131,12 @@
# @param node_purge_gc_batch_limit
# Nodes will be purged in batches of this size, one batch per gc-interval.
#
# @param log_slow_statements
# This sets the number of seconds before an SQL query is considered "slow." Slow
# SQL queries are logged as warnings, to assist in debugging and tuning. Note
# PuppetDB does not interrupt slow queries; it simply reports them after they
# complete.
#
# The default value is `10` seconds. A value of 0 will disable logging of slow
# queries. This option is supported in PuppetDB >= 1.1.
#
# @param conn_max_age
# The maximum time (in minutes) for a pooled connection to remain unused before
# it is closed off.
#
# If not supplied, we default to `60` minutes. This option is supported in PuppetDB >= 1.1.
#
# @param conn_keep_alive
# This sets the time (in minutes) for a connection to remain idle before sending
# a test query to the DB. This is useful to prevent a DB from timing out
# connections on its end.
#
# If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.1.
#
# @param conn_lifetime
# The maximum time (in minutes) a pooled connection should remain open. Any
# connections older than this setting will be closed off. Connections currently in
Expand Down Expand Up @@ -249,28 +233,12 @@
# is set to `undef`, and `manage_database` is set to `true`, it will use the value of
# the `database_name` parameter. This option is supported in PuppetDB >= 1.6.
#
# @param read_log_slow_statements
# This sets the number of seconds before an SQL query to the read database is
# considered "slow." Slow SQL queries are logged as warnings, to assist in
# debugging and tuning. Note PuppetDB does not interrupt slow queries; it simply
# reports them after they complete.
#
# The default value is 10 seconds. A value of 0 will disable logging of slow
# queries. This option is supported in PuppetDB >= 1.6.
#
# @param read_conn_max_age
# The maximum time (in minutes) for a pooled read database connection to remain
# unused before it is closed off.
#
# If not supplied, we default to 60 minutes. This option is supported in PuppetDB >= 1.6.
#
# @param read_conn_keep_alive
# This sets the time (in minutes) for a read database connection to remain idle
# before sending a test query to the DB. This is useful to prevent a DB from
# timing out connections on its end.
#
# If not supplied, we default to 45 minutes. This option is supported in PuppetDB >= 1.6.
#
# @param read_conn_lifetime
# The maximum time (in minutes) a pooled read database connection should remain
# open. Any connections older than this setting will be closed off. Connections
Expand Down Expand Up @@ -420,9 +388,7 @@
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
$gc_interval = $puppetdb::params::gc_interval,
$node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
$log_slow_statements = $puppetdb::params::log_slow_statements,
$conn_max_age = $puppetdb::params::conn_max_age,
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
$conn_lifetime = $puppetdb::params::conn_lifetime,
$puppetdb_package = $puppetdb::params::puppetdb_package,
$puppetdb_service = $puppetdb::params::puppetdb_service,
Expand All @@ -438,9 +404,7 @@
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
$read_database_jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
$read_database_validate = $puppetdb::params::read_database_validate,
$read_log_slow_statements = $puppetdb::params::read_log_slow_statements,
$read_conn_max_age = $puppetdb::params::read_conn_max_age,
$read_conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
$read_conn_lifetime = $puppetdb::params::read_conn_lifetime,
$confdir = $puppetdb::params::confdir,
$vardir = $puppetdb::params::vardir,
Expand Down Expand Up @@ -499,9 +463,7 @@
facts_blacklist => $facts_blacklist,
gc_interval => $gc_interval,
node_purge_gc_batch_limit => $node_purge_gc_batch_limit,
log_slow_statements => $log_slow_statements,
conn_max_age => $conn_max_age,
conn_keep_alive => $conn_keep_alive,
conn_lifetime => $conn_lifetime,
puppetdb_package => $puppetdb_package,
puppetdb_service => $puppetdb_service,
Expand All @@ -519,9 +481,7 @@
manage_read_db_password => $manage_read_db_password,
read_database_jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
read_database_validate => $read_database_validate,
read_log_slow_statements => $read_log_slow_statements,
read_conn_max_age => $read_conn_max_age,
read_conn_keep_alive => $read_conn_keep_alive,
read_conn_lifetime => $read_conn_lifetime,
puppetdb_user => $puppetdb_user,
puppetdb_group => $puppetdb_group,
Expand Down
4 changes: 0 additions & 4 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@
$gc_interval = '60'
$node_purge_gc_batch_limit = '25'

$log_slow_statements = '10'
$conn_max_age = '60'
$conn_keep_alive = '45'
$conn_lifetime = '0'

$max_threads = undef
Expand All @@ -70,9 +68,7 @@
$manage_read_db_password = true
$read_database_jdbc_ssl_properties = ''
$read_database_validate = true
$read_log_slow_statements = '10'
$read_conn_max_age = '60'
$read_conn_keep_alive = '45'
$read_conn_lifetime = '0'
$read_database_max_pool_size = undef

Expand Down
Loading
Loading