From 8b321cd316a50ec5569bb93a44713d2d8d0e47a8 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sun, 2 Mar 2025 13:16:22 +0100 Subject: [PATCH] recommit for updates in build 37 --- doc/file.README.html | 6 -- doc/index.html | 6 -- .../cd_alloy_3A_3Amain_3A_3Aconfig.html | 6 +- .../cd_alloy_3A_3Amain_3A_3Adirs.html | 20 +++--- .../cd_alloy_3A_3Amain_3A_3Afiles.html | 26 +++---- .../cd_alloy_3A_3Amain_3A_3Ainstall.html | 6 +- .../cd_alloy_3A_3Amain_3A_3Aservice.html | 12 ++-- doc/puppet_classes/cd_alloy_3A_3Aparams.html | 67 +++++++++---------- 8 files changed, 61 insertions(+), 88 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index 1215d15..73198fb 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -173,12 +173,6 @@ block, not per class.

  • ERB Template Parser

  • -

    Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)

    -
  • -

    Markdown-lint

    -
  • -

    Spellcheck

    -

  • Sonar Quality Gate

    • diff --git a/doc/index.html b/doc/index.html index 8374f59..4d93e1f 100644 --- a/doc/index.html +++ b/doc/index.html @@ -173,12 +173,6 @@ block, not per class.

  • ERB Template Parser

  • -

    Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)

    -
  • -

    Markdown-lint

    -
  • -

    Spellcheck

    -

  • Sonar Quality Gate

    • diff --git a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Aconfig.html index 7ced012..4d01ab1 100644 --- a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Aconfig.html @@ -105,9 +105,7 @@ 7 8 9 -10 -11 -12 +10 
    # File 'manifests/main/config.pp', line 6
@@ -115,9 +113,7 @@
 class cd_alloy::main::config (
 
 ) inherits cd_alloy::params {
-
   include cd_alloy::main::service
-
 }
    diff --git a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Adirs.html index 079c7c2..a8d1718 100644 --- a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Adirs.html @@ -117,8 +117,7 @@ 19 20 21 -22 -23 +22 
    # File 'manifests/main/dirs.pp', line 6
@@ -126,19 +125,18 @@
 class cd_alloy::main::dirs (
 
 ) inherits cd_alloy::params {
-
   require cd_alloy::main::install
 
   # main config dir
   file { $ay_main_dir:
-    ensure    =>  directory,
-    owner     =>  'root',
-    group     =>  'alloy',
-    mode      =>  '0770',
-    selrange  =>  s0,
-    selrole   =>  object_r,
-    seltype   =>  etc_t,
-    seluser   =>  system_u,
+    ensure   => directory,
+    owner    => 'root',
+    group    => 'alloy',
+    mode     => '0770',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => etc_t,
+    seluser  => system_u,
   }
 }
    diff --git a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Afiles.html index d16d6c7..0b546ce 100644 --- a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Afiles.html @@ -121,9 +121,7 @@ 23 24 25 -26 -27 -28 +26 
    # File 'manifests/main/files.pp', line 6
@@ -131,25 +129,23 @@
 class cd_alloy::main::files (
 
 ) inherits cd_alloy::params {
-
   require cd_alloy::main::dirs
 
   # Ensure log_targets is always an array
   $log_targets_array = Array($cd_alloy::params::ay_log_targets, true)
 
   file { $ay_main_file:
-    ensure    => file,
-    owner     => 'root',
-    group     => 'root',
-    mode      => '0644',
-    selrange  => s0,
-    selrole   => object_r,
-    seltype   => etc_t,
-    seluser   => system_u,
-    content   => template('cd_alloy/config.alloy.erb'),
-    notify    => Service[$ay_service],
+    ensure   => file,
+    owner    => 'root',
+    group    => 'root',
+    mode     => '0644',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => etc_t,
+    seluser  => system_u,
+    content  => template('cd_alloy/config.alloy.erb'),
+    notify   => Service[$ay_service],
   }
-
 }
    diff --git a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Ainstall.html index cddb032..8871330 100644 --- a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Ainstall.html @@ -77,7 +77,7 @@

    Summary

    - Class manages module logic for the cd_alloy module + Class installs packages for the cd_alloy module

    Overview

    @@ -109,8 +109,7 @@ 11 12 13 -14 -15 +14 
    # File 'manifests/main/install.pp', line 6
@@ -118,7 +117,6 @@
 class cd_alloy::main::install (
 
 ) inherits cd_alloy::params {
-
   require cd_alloy::main::yumrepo
 
   package { $reqpackages:
diff --git a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Aservice.html
index b677f09..4b6574c 100644
--- a/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_alloy_3A_3Amain_3A_3Aservice.html
@@ -112,8 +112,7 @@
 14
 15
 16
-17
-18
    +17 
    # File 'manifests/main/service.pp', line 6
@@ -121,14 +120,13 @@
 class cd_alloy::main::service (
 
 ) inherits cd_alloy::params {
-
   require cd_alloy::main::files
 
   service { $ay_service:
-    ensure      => running,
-    hasstatus   => true,
-    hasrestart  => true,
-    enable      => true,
+    ensure     => running,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => true,
   }
 }
    diff --git a/doc/puppet_classes/cd_alloy_3A_3Aparams.html b/doc/puppet_classes/cd_alloy_3A_3Aparams.html index b4ef51d..4092243 100644 --- a/doc/puppet_classes/cd_alloy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_alloy_3A_3Aparams.html @@ -113,7 +113,7 @@ reqpackages - (string) + (String) (defaults to: 'alloy') @@ -131,7 +131,7 @@ pkg_ensure - (string) + (String) (defaults to: 'latest') @@ -149,7 +149,7 @@ ay_loki_url - (string) + (String) (defaults to: 'https://loki.example.net/loki/api/v1/push') @@ -167,10 +167,10 @@ ay_loki_username - (string) + (String) - (defaults to: '') + (defaults to: 'loki_user') — @@ -185,10 +185,10 @@ ay_loki_userpass - (string) + (String) - (defaults to: '') + (defaults to: 'loki_pass') — @@ -203,7 +203,7 @@ ay_manage_loki - (boolean) + (String) (defaults to: true) @@ -221,7 +221,7 @@ ay_manage_prom - (boolean) + (Boolean) (defaults to: true) @@ -239,7 +239,7 @@ ay_prom_url - (string) + (String) (defaults to: 'https://prometheus.example.net/api/v1/write') @@ -257,12 +257,17 @@ ay_log_targets - (Any) + (Array) (defaults to: ['/var/log/messages','/var/log/secure',]) + — +
    +

    the logging targets

    +
    + @@ -276,7 +281,6 @@ 
     
 
-14
 15
 16
 17
@@ -305,44 +309,39 @@
 40
 41
 42
-43
-44
-45
    +43 - 
    # File 'manifests/params.pp', line 14
+        
    # File 'manifests/params.pp', line 15
 
 class cd_alloy::params (
 
-$reqpackages        = 'alloy',
-$pkg_ensure         = 'latest',
+  String $reqpackages         = 'alloy',
+  String $pkg_ensure          = 'latest',
 
 # loki
-$ay_manage_loki     = true,
-$ay_loki_url        = 'https://loki.example.net/loki/api/v1/push',
-$ay_loki_username   = '',
-$ay_loki_userpass   = '',
-$ay_log_targets     = ['/var/log/messages','/var/log/secure',],
+  String $ay_manage_loki      = true,
+  String $ay_loki_url         = 'https://loki.example.net/loki/api/v1/push',
+  String $ay_loki_username    = 'loki_user',
+  String $ay_loki_userpass    = 'loki_pass',
+  Array $ay_log_targets       = ['/var/log/messages','/var/log/secure',],
 
 # prometheus
-$ay_manage_prom     = true,
-$ay_prom_url        = 'https://prometheus.example.net/api/v1/write',
+  Boolean $ay_manage_prom     = true,
+  String $ay_prom_url         = 'https://prometheus.example.net/api/v1/write',
 
 ) {
+  # service
+  $ay_service         = 'alloy'
 
-# service
-$ay_service         = 'alloy'
-
-# dirs
-$ay_main_dir        = '/etc/alloy'
-
-# files
-$ay_main_file       = "${ay_main_dir}/config.alloy"
+  # dirs
+  $ay_main_dir        = '/etc/alloy'
 
+  # files
+  $ay_main_file       = "${ay_main_dir}/config.alloy"
 
   # includes must be last
   include cd_alloy::main::config
-
 }