Merge pull request #1259 from voxpupuli/remove-unused-params

Remove unused parameters (logging)

Author: h-haaks

REFERENCE.md

@@ -111,18 +111,13 @@ The following parameters are available in the `elasticsearch` class:
 * [`config`](#-elasticsearch--config)
 * [`configdir`](#-elasticsearch--configdir)
 * [`configdir_recurselimit`](#-elasticsearch--configdir_recurselimit)
-* [`daily_rolling_date_pattern`](#-elasticsearch--daily_rolling_date_pattern)
 * [`datadir`](#-elasticsearch--datadir)
-* [`default_logging_level`](#-elasticsearch--default_logging_level)
 * [`defaults_location`](#-elasticsearch--defaults_location)
-* [`deprecation_logging`](#-elasticsearch--deprecation_logging)
-* [`deprecation_logging_level`](#-elasticsearch--deprecation_logging_level)
 * [`download_tool`](#-elasticsearch--download_tool)
 * [`download_tool_insecure`](#-elasticsearch--download_tool_insecure)
 * [`download_tool_verify_certificates`](#-elasticsearch--download_tool_verify_certificates)
 * [`elasticsearch_group`](#-elasticsearch--elasticsearch_group)
 * [`elasticsearch_user`](#-elasticsearch--elasticsearch_user)
-* [`file_rolling_type`](#-elasticsearch--file_rolling_type)
 * [`homedir`](#-elasticsearch--homedir)
 * [`indices`](#-elasticsearch--indices)
 * [`init_defaults`](#-elasticsearch--init_defaults)
@@ -134,10 +129,6 @@ The following parameters are available in the `elasticsearch` class:
 * [`license`](#-elasticsearch--license)
 * [`logdir`](#-elasticsearch--logdir)
 * [`logdir_mode`](#-elasticsearch--logdir_mode)
-* [`logging_config`](#-elasticsearch--logging_config)
-* [`logging_file`](#-elasticsearch--logging_file)
-* [`logging_level`](#-elasticsearch--logging_level)
-* [`logging_template`](#-elasticsearch--logging_template)
 * [`manage_datadir`](#-elasticsearch--manage_datadir)
 * [`manage_logdir`](#-elasticsearch--manage_logdir)
 * [`manage_repo`](#-elasticsearch--manage_repo)
@@ -164,12 +155,8 @@ The following parameters are available in the `elasticsearch` class:
 * [`restart_package_change`](#-elasticsearch--restart_package_change)
 * [`restart_plugin_change`](#-elasticsearch--restart_plugin_change)
 * [`roles`](#-elasticsearch--roles)
-* [`rolling_file_max_backup_index`](#-elasticsearch--rolling_file_max_backup_index)
-* [`rolling_file_max_file_size`](#-elasticsearch--rolling_file_max_file_size)
 * [`scripts`](#-elasticsearch--scripts)
 * [`secrets`](#-elasticsearch--secrets)
-* [`security_logging_content`](#-elasticsearch--security_logging_content)
-* [`security_logging_source`](#-elasticsearch--security_logging_source)
 * [`service_name`](#-elasticsearch--service_name)
 * [`service_provider`](#-elasticsearch--service_provider)
 * [`slm_policies`](#-elasticsearch--slm_policies)
@@ -294,45 +281,18 @@ Data type: `Integer`
 Dictates how deeply the file copy recursion logic should descend when
 copying files from the `configdir` to instance `configdir`s.
 
-##### <a name="-elasticsearch--daily_rolling_date_pattern"></a>`daily_rolling_date_pattern`
-
-Data type: `String`
-
-File pattern for the file appender log when file_rolling_type is 'dailyRollingFile'.
-
 ##### <a name="-elasticsearch--datadir"></a>`datadir`
 
 Data type: `Elasticsearch::Multipath`
 
 Allows you to set the data directory of Elasticsearch.
 
-##### <a name="-elasticsearch--default_logging_level"></a>`default_logging_level`
-
-Data type: `String`
-
-Default logging level for Elasticsearch.
-
-Default value: `$logging_level`
-
 ##### <a name="-elasticsearch--defaults_location"></a>`defaults_location`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
 Absolute path to directory containing init defaults file.
 
-##### <a name="-elasticsearch--deprecation_logging"></a>`deprecation_logging`
-
-Data type: `Boolean`
-
-Whether to enable deprecation logging. If enabled, deprecation logs will be
-saved to ${cluster.name}_deprecation.log in the Elasticsearch log folder.
-
-##### <a name="-elasticsearch--deprecation_logging_level"></a>`deprecation_logging_level`
-
-Data type: `String`
-
-Default deprecation logging level for Elasticsearch.
-
 ##### <a name="-elasticsearch--download_tool"></a>`download_tool`
 
 Data type: `Optional[String]`
@@ -366,14 +326,6 @@ Data type: `String`
 
 The user Elasticsearch should run as. This also sets file ownership.
 
-##### <a name="-elasticsearch--file_rolling_type"></a>`file_rolling_type`
-
-Data type: `Enum['dailyRollingFile', 'rollingFile', 'file']`
-
-Configuration for the file appender rotation. It can be 'dailyRollingFile',
-'rollingFile' or 'file'. The first rotates by name, the second one by size
-or third don't rotate automatically.
-
 ##### <a name="-elasticsearch--homedir"></a>`homedir`
 
 Data type: `Stdlib::Absolutepath`
@@ -446,32 +398,6 @@ Mode directory that will be used for Elasticsearch logging (default 2750).
 
 Default value: `'2750'`
 
-##### <a name="-elasticsearch--logging_config"></a>`logging_config`
-
-Data type: `Hash`
-
-Representation of information to be included in the log4j.properties file.
-
-##### <a name="-elasticsearch--logging_file"></a>`logging_file`
-
-Data type: `Optional[String]`
-
-Instead of a hash, you may supply a `puppet://` file source for the
-log4j.properties file.
-
-##### <a name="-elasticsearch--logging_level"></a>`logging_level`
-
-Data type: `String`
-
-Default logging level for Elasticsearch.
-
-##### <a name="-elasticsearch--logging_template"></a>`logging_template`
-
-Data type: `Optional[String]`
-
-Use a custom logging template - just supply the relative path, i.e.
-`$module/elasticsearch/logging.yml.erb`
-
 ##### <a name="-elasticsearch--manage_datadir"></a>`manage_datadir`
 
 Data type: `Boolean`
@@ -667,18 +593,6 @@ Data type: `Hash`
 
 Define roles via a hash. This is mainly used with Hiera's auto binding.
 
-##### <a name="-elasticsearch--rolling_file_max_backup_index"></a>`rolling_file_max_backup_index`
-
-Data type: `Integer`
-
-Max number of logs to store whern file_rolling_type is 'rollingFile'
-
-##### <a name="-elasticsearch--rolling_file_max_file_size"></a>`rolling_file_max_file_size`
-
-Data type: `String`
-
-Max log file size when file_rolling_type is 'rollingFile'
-
 ##### <a name="-elasticsearch--scripts"></a>`scripts`
 
 Data type: `Hash`
@@ -692,20 +606,6 @@ Data type: `Optional[Hash]`
 Optional default configuration hash of key/value pairs to store in the
 Elasticsearch keystore file. If unset, the keystore is left unmanaged.
 
-##### <a name="-elasticsearch--security_logging_content"></a>`security_logging_content`
-
-Data type: `Optional[String]`
-
-File content for x-pack logging configuration file (will be placed
-into log4j2.properties file).
-
-##### <a name="-elasticsearch--security_logging_source"></a>`security_logging_source`
-
-Data type: `Optional[String]`
-
-File source for x-pack logging configuration file (will be placed
-into log4j2.properties).
-
 ##### <a name="-elasticsearch--service_name"></a>`service_name`
 
 Data type: `String`

data/common.yaml

@@ -11,17 +11,11 @@ elasticsearch::autoupgrade: false
 elasticsearch::config: {}
 elasticsearch::configdir: "/etc/elasticsearch"
 elasticsearch::configdir_recurselimit: 2
-elasticsearch::default_logging_level: INFO
-elasticsearch::daily_rolling_date_pattern: |
-  "'.'yyyy-MM-dd"
 elasticsearch::defaults_location:
-elasticsearch::deprecation_logging: false
-elasticsearch::deprecation_logging_level: DEBUG
 elasticsearch::download_tool:
 elasticsearch::download_tool_insecure:
 elasticsearch::download_tool_verify_certificates: true
 elasticsearch::ensure: present
-elasticsearch::file_rolling_type: dailyRollingFile
 elasticsearch::indices: {}
 elasticsearch::init_defaults: {}
 elasticsearch::init_defaults_file:
@@ -30,10 +24,6 @@ elasticsearch::instances: {}
 elasticsearch::jvm_options: []
 elasticsearch::license:
 elasticsearch::logdir: "/var/log/elasticsearch"
-elasticsearch::logging_config: {}
-elasticsearch::logging_file:
-elasticsearch::logging_level: INFO
-elasticsearch::logging_template:
 elasticsearch::manage_datadir: true
 elasticsearch::manage_logdir: true
 elasticsearch::manage_repo: true
@@ -53,12 +43,8 @@ elasticsearch::purge_secrets: false
 elasticsearch::repo_stage: false
 elasticsearch::restart_on_change: false
 elasticsearch::roles: {}
-elasticsearch::rolling_file_max_backup_index: 1
-elasticsearch::rolling_file_max_file_size: 10MB
 elasticsearch::scripts: {}
 elasticsearch::secrets:
-elasticsearch::security_logging_content:
-elasticsearch::security_logging_source:
 elasticsearch::service_name: elasticsearch
 elasticsearch::service_provider: systemd
 elasticsearch::snapshot_repositories: {}

manifests/config.pp

@@ -141,28 +141,6 @@
       $_tls_config = {}
     }
 
-    # # Logging file or hash
-    # if ($elasticsearch::logging_file != undef) {
-    #   $_log4j_content = undef
-    # } else {
-    #   if ($elasticsearch::logging_template != undef ) {
-    #     $_log4j_content = template($elasticsearch::logging_template)
-    #   } else {
-    #     $_log4j_content = template("${module_name}/etc/elasticsearch/log4j2.properties.erb")
-    #   }
-    #   $_logging_source = undef
-    # }
-    # file {
-    #   "${elasticsearch::configdir}/log4j2.properties":
-    #     ensure  => file,
-    #     content => $_log4j_content,
-    #     source  => $_logging_source,
-    #     mode    => '0644',
-    #     notify  => $elasticsearch::_notify_service,
-    #     require => Class['elasticsearch::package'],
-    #     before  => Class['elasticsearch::service'],
-    # }
-
     # Generate Elasticsearch config
     $data =
       $elasticsearch::config + { 'path.data' => $elasticsearch::datadir } + { 'path.logs' => $elasticsearch::logdir } + $_tls_config

manifests/init.pp

@@ -76,25 +76,12 @@
 #   Dictates how deeply the file copy recursion logic should descend when
 #   copying files from the `configdir` to instance `configdir`s.
 #
-# @param daily_rolling_date_pattern
-#   File pattern for the file appender log when file_rolling_type is 'dailyRollingFile'.
-#
 # @param datadir
 #   Allows you to set the data directory of Elasticsearch.
 #
-# @param default_logging_level
-#   Default logging level for Elasticsearch.
-#
 # @param defaults_location
 #   Absolute path to directory containing init defaults file.
 #
-# @param deprecation_logging
-#   Whether to enable deprecation logging. If enabled, deprecation logs will be
-#   saved to ${cluster.name}_deprecation.log in the Elasticsearch log folder.
-#
-# @param deprecation_logging_level
-#   Default deprecation logging level for Elasticsearch.
-#
 # @param download_tool
 #   Command-line invocation with which to retrieve an optional package_url.
 #
@@ -113,11 +100,6 @@
 # @param elasticsearch_user
 #   The user Elasticsearch should run as. This also sets file ownership.
 #
-# @param file_rolling_type
-#   Configuration for the file appender rotation. It can be 'dailyRollingFile',
-#   'rollingFile' or 'file'. The first rotates by name, the second one by size
-#   or third don't rotate automatically.
-#
 # @param homedir
 #   Directory where the elasticsearch installation's files are kept (plugins, etc.)
 #
@@ -151,20 +133,6 @@
 # @param logdir_mode
 #   Mode directory that will be used for Elasticsearch logging (default 2750).
 #
-# @param logging_config
-#   Representation of information to be included in the log4j.properties file.
-#
-# @param logging_file
-#   Instead of a hash, you may supply a `puppet://` file source for the
-#   log4j.properties file.
-#
-# @param logging_level
-#   Default logging level for Elasticsearch.
-#
-# @param logging_template
-#   Use a custom logging template - just supply the relative path, i.e.
-#   `$module/elasticsearch/logging.yml.erb`
-#
 # @param manage_datadir
 #   Enable datadir management (default true).
 #
@@ -270,27 +238,13 @@
 # @param roles
 #   Define roles via a hash. This is mainly used with Hiera's auto binding.
 #
-# @param rolling_file_max_backup_index
-#   Max number of logs to store whern file_rolling_type is 'rollingFile'
-#
-# @param rolling_file_max_file_size
-#   Max log file size when file_rolling_type is 'rollingFile'
-#
 # @param scripts
 #   Define scripts via a hash. This is mainly used with Hiera's auto binding.
 #
 # @param secrets
 #   Optional default configuration hash of key/value pairs to store in the
 #   Elasticsearch keystore file. If unset, the keystore is left unmanaged.
 #
-# @param security_logging_content
-#   File content for x-pack logging configuration file (will be placed
-#   into log4j2.properties file).
-#
-# @param security_logging_source
-#   File source for x-pack logging configuration file (will be placed
-#   into log4j2.properties).
-#
 # @param service_name
 #   Elasticsearch service name
 #
@@ -364,17 +318,13 @@
   Hash                                            $config,
   Stdlib::Absolutepath                            $configdir,
   Integer                                         $configdir_recurselimit,
-  String                                          $daily_rolling_date_pattern,
   Elasticsearch::Multipath                        $datadir,
   Optional[Stdlib::Absolutepath]                  $defaults_location,
-  Boolean                                         $deprecation_logging,
-  String                                          $deprecation_logging_level,
   Optional[String]                                $download_tool,
   Optional[String]                                $download_tool_insecure,
   Boolean                                         $download_tool_verify_certificates,
   String                                          $elasticsearch_group,
   String                                          $elasticsearch_user,
-  Enum['dailyRollingFile', 'rollingFile', 'file'] $file_rolling_type,
   Stdlib::Absolutepath                            $homedir,
   Hash                                            $indices,
   Hash                                            $init_defaults,
@@ -383,10 +333,6 @@
   Array[String]                                   $jvm_options,
   Optional[Variant[String, Hash]]                 $license,
   Stdlib::Absolutepath                            $logdir,
-  Hash                                            $logging_config,
-  Optional[String]                                $logging_file,
-  String                                          $logging_level,
-  Optional[String]                                $logging_template,
   Boolean                                         $manage_datadir,
   Boolean                                         $manage_logdir,
   Boolean                                         $manage_repo,
@@ -407,12 +353,8 @@
   Variant[Boolean, String]                        $repo_stage,
   Boolean                                         $restart_on_change,
   Hash                                            $roles,
-  Integer                                         $rolling_file_max_backup_index,
-  String                                          $rolling_file_max_file_size,
   Hash                                            $scripts,
   Optional[Hash]                                  $secrets,
-  Optional[String]                                $security_logging_content,
-  Optional[String]                                $security_logging_source,
   String                                          $service_name,
   Enum['init', 'openbsd', 'openrc', 'systemd']    $service_provider,
   Hash                                            $snapshot_repositories,
@@ -430,7 +372,6 @@
   Hash                                            $slm_policies              = {},
   Optional[Stdlib::Absolutepath]                  $ca_certificate            = undef,
   Optional[Stdlib::Absolutepath]                  $certificate               = undef,
-  String                                          $default_logging_level     = $logging_level,
   Optional[String]                                $keystore_password         = undef,
   Optional[Stdlib::Absolutepath]                  $keystore_path             = undef,
   Stdlib::Filemode                                $logdir_mode               = '2750',