From bffc0d03d06b99c279df37b24c7864f5a7806efc Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 7 Sep 2026 13:42:16 +0200 Subject: [PATCH] Recommit for updates in build 12 --- Jenkinsfile | 127 -------------- doc/_index.html | 5 + doc/puppet_class_list.html | 9 +- ...confdroid_alloy_3A_3Amain_3A_3Aconfig.html | 10 +- ...oid_alloy_3A_3Amonitoring_3A_3Atarget.html | 156 ++++++++++++++++++ .../confdroid_alloy_3A_3Aparams.html | 76 ++++++++- 6 files changed, 249 insertions(+), 134 deletions(-) delete mode 100644 Jenkinsfile create mode 100644 doc/puppet_classes/confdroid_alloy_3A_3Amonitoring_3A_3Atarget.html diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 683a7bf..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,127 +0,0 @@ -pipeline { - agent { - label 'puppet' - } - - post { - always { - deleteDir() /* clean up our workspace */ - } - success { - updateGitlabCommitStatus state: 'success' - } - failure { - updateGitlabCommitStatus state: 'failed' - step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true]) - } - } - - options { - gitLabConnection('gitlab.confdroid.com') - } - - stages { - - stage('pull master') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - sh ''' - git config user.name "Jenkins Server" - git config user.email jenkins@confdroid.com - # Ensure we're on the development branch (triggered by push) - git checkout development - # Create jenkins branch from development - git checkout -b jenkins-build-$BUILD_NUMBER - # Optionally merge master into jenkins to ensure compatibility - git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; } - ''' - } - } - } - - stage('puppet parser') { - steps { - sh '''for file in $(find . -iname \'*.pp\'); do - /opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1; - done;''' - } - } - - stage('check templates') { - steps{ - sh '''for file in $(find . -iname \'*.erb\'); - do erb -P -x -T "-" $file | ruby -c || exit 1; - done;''' - } - } - - stage('puppet-lint') { - steps { - sh '''/usr/local/bin/puppet-lint . \\ - --no-variable_scope-check \\ - || { echo "Puppet lint failed"; exit 1; } - ''' - } - } - - stage('SonarScan') { - steps { - withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) { - sh ''' - /opt/sonar-scanner/bin/sonar-scanner \ - -Dsonar.projectKey=confdroid_alloy \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://sonarqube.confdroid.com \ - -Dsonar.token=$SONAR_TOKEN - ''' - } - } - } - - stage('create Puppet documentation') { - steps { - sh '/opt/puppetlabs/bin/puppet strings' - } - } - - stage('update repo') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - sh ''' - git config user.name "Jenkins Server" - git config user.email jenkins@confdroid.com - git rm -r --cached .vscode || echo "No .vscode to remove from git" - git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" - git push origin HEAD:master - ''' - } - } - } - stage('Mirror to Gitea') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - withCredentials([usernamePassword( - credentialsId: 'Jenkins-gitea', - usernameVariable: 'GITEA_USER', - passwordVariable: 'GITEA_TOKEN')]) { - script { - // Checkout from GitLab (already done implicitly) - sh ''' - git checkout master - git pull origin master - git branch -D development - git branch -D jenkins-build-$BUILD_NUMBER - git rm -f Jenkinsfile - git rm -r --cached .vscode || echo "No .vscode to remove from git" - git commit --amend --no-edit --allow-empty - git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_alloy.git - git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ - push master --mirror - ''' - } - } - } - } - } - } -} \ No newline at end of file diff --git a/doc/_index.html b/doc/_index.html index ba82656..f3f32fd 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -103,6 +103,11 @@ +
  • + confdroid_alloy::monitoring::target + +
    • +
  • confdroid_alloy::params diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index eef7b80..b5058b5 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -85,7 +85,14 @@
    • -
  • +
  • +
    + confdroid_alloy::monitoring::target +
    +
    • + + +
  • confdroid_alloy::params
    diff --git a/doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Aconfig.html index 661f929..c85fbdc 100644 --- a/doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Aconfig.html @@ -105,7 +105,11 @@ 7 8 9 -10 +10 +11 +12 +13 +14 
    # File 'manifests/main/config.pp', line 6
@@ -114,6 +118,10 @@ class confdroid_alloy::main::config (
 
 ) inherits confdroid_alloy::params {
   include confdroid_alloy::main::service
+
+  if $ay_manage_nagios == true {
+    include confdroid_alloy::monitoring::target
+  }
 }
    diff --git a/doc/puppet_classes/confdroid_alloy_3A_3Amonitoring_3A_3Atarget.html b/doc/puppet_classes/confdroid_alloy_3A_3Amonitoring_3A_3Atarget.html new file mode 100644 index 0000000..8390ad8 --- /dev/null +++ b/doc/puppet_classes/confdroid_alloy_3A_3Amonitoring_3A_3Atarget.html @@ -0,0 +1,156 @@ + + + + + + + Puppet Class: confdroid_alloy::monitoring::target + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: confdroid_alloy::monitoring::target

    +
    + +
    +
    Inherits:
    +
    confdroid_alloy::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/monitoring/target.pp +
    +
    +
    + +

    Summary

    + class manages exports for nagios monitoring + +

    Overview

    +
    +
    + +

    confdroid_alloy::monitoring::target.pp Module name: confdroid_alloy Author: 12ww1160 (12ww1160@puppetsoft.com)

    + +
    +
    + + + +
    + + + +
    + + + + + +
    + 
    +
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
    +     		+ 
    # File 'manifests/monitoring/target.pp', line 6
+
+class confdroid_alloy::monitoring::target (
+
+) inherits confdroid_alloy::params {
+  if $ay_manage_nagios == true {
+    @@nagios_service { "check_alloy_${fqdn}":
+      check_command       => "check_nrpe!check_alloy!${fn_procs_allowed}!alloy-server",
+      use                 => 'generic-service',
+      host_name           => $fqdn,
+      notification_period => '24x7',
+      service_description => "${fqdn}_check_alloy",
+      target              => $ay_target_service,
+      owner               => 'nagios',
+      group               => 'nagios',
+      mode                => '0640',
+      contacts            => $ay_target_contacts,
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file diff --git a/doc/puppet_classes/confdroid_alloy_3A_3Aparams.html b/doc/puppet_classes/confdroid_alloy_3A_3Aparams.html index 70f177c..7e47b55 100644 --- a/doc/puppet_classes/confdroid_alloy_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_alloy_3A_3Aparams.html @@ -79,6 +79,8 @@ confdroid_alloy::main::yumrepo
    + confdroid_alloy::monitoring::target
    + @@ -356,6 +358,60 @@ —

    the maximum time to wait before sending

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

    whether to manage nagios service exports

    +
    + +
    • + +
  • + + ay_target_service + + + (String) + + + (defaults to: '/etc/nagios/conf.d/alloy_service.cfg') + + + — +
    +

    the target file for nagios service exports

    +
    + +
    • + +
  • + + ay_target_contacts + + + (Array) + + + (defaults to: ['nagiosadmin']) + + + — +
    +

    the contacts for nagios service exports

    • @@ -371,9 +427,6 @@ 
     
 
-22
-23
-24
 25
 26
 27
@@ -404,10 +457,18 @@
 52
 53
 54
-55
    +55 +56 +57 +58 +59 +60 +61 +62 +63 - 
    # File 'manifests/params.pp', line 22
+        
    # File 'manifests/params.pp', line 25
 
 class confdroid_alloy::params (
 
@@ -430,6 +491,11 @@ class confdroid_alloy::params (
   String $ay_prom_max_samples_per_send        = '2000',
   String $ay_prom_batch_send_deadline         = '5s',
 
+# nagios
+  Boolean $ay_manage_nagios                   = false,
+  String $ay_target_service                   = '/etc/nagios/conf.d/alloy_service.cfg',
+  Array $ay_target_contacts                   = ['nagiosadmin'],
+
 ) {
   # service
   $ay_service         = 'alloy'