Merge branch 'jenkins-build-14' into 'master'

Auto-merge for build 14

See merge request puppet/confdroid_automatic!11

Jenkinsfile

@@ -1,132 +0,0 @@
-pipeline {
-    agent any
-
-    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_automatic \
-                -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 commit --amend --no-edit --allow-empty
-                git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
-                git push -o merge_request.create \
-                         -o merge_request.target=master \
-                         -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
-                         -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
-                         -o merge_request.merge_when_pipeline_succeeds=true \
-                         origin jenkins-build-$BUILD_NUMBER
-            '''
-        }
-      }
-    }
-
-      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_automatic.git
-                    git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                    push master --mirror
-                    '''
-            }
-          }
-        }
-      }
-    }
-  }
-}

doc/puppet_classes/confdroid_automatic_3A_3Amain_3A_3Aconfig.html

@@ -105,7 +105,11 @@
 7
 8
 9
-10</pre>
+10
+11
+12
+13
+14</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -114,6 +118,10 @@ class confdroid_automatic::main::config (
 
 ) inherits confdroid_automatic::params {
   include confdroid_automatic::main::service
+
+  if $ac_manage_nagios == true {
+    include confdroid_automatic::monitoring::target
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_automatic_3A_3Aparams.html

@@ -318,6 +318,78 @@
         —
         <div class='inline'>
 <p>packages to exclude from updates</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ac_manage_nagios</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>false</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether to manage nagios monitoring</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ac_target_service</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;/etc/nagios/conf.d/automatic_service.cfg&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>where to write the nagios service config</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ac_target_contacts</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;nagiosadmin&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>which nagios contacts to use</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ac_procs_allowed</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;1:&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>how many processes are allowed to run</p>
 </div>
       
     </li>
@@ -333,10 +405,6 @@
         <pre class="lines">
 
 
-19
-20
-21
-22
 23
 24
 25
@@ -371,10 +439,20 @@
 54
 55
 56
-57</pre>
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 23</span>
 
 class confdroid_automatic::params (
 
@@ -393,6 +471,12 @@ class confdroid_automatic::params (
   String $ac_email_to                 = &#39;root@example.net&#39;,
   String $ac_email_host               = &#39;localhost&#39;,
 
+  # monitoring
+  Boolean $ac_manage_nagios           = false,
+  String $ac_target_service           = &#39;/etc/nagios/conf.d/automatic_service.cfg&#39;,
+  String $ac_target_contacts          = &#39;nagiosadmin&#39;,
+  String $ac_procs_allowed            = &#39;1:&#39;,
+
 ) {
 # Facts
   $fqdn                     = $facts[&#39;networking&#39;][&#39;fqdn&#39;]

manifests/main/config.pp

@@ -7,4 +7,8 @@ class confdroid_automatic::main::config (
 
 ) inherits confdroid_automatic::params {
   include confdroid_automatic::main::service
+
+  if $ac_manage_nagios == true {
+    include confdroid_automatic::monitoring::target
+  }
 }

manifests/monitoring/target.pp

@@ -0,0 +1,22 @@
+## confdroid_automatic::monitoring::target.pp
+# Module name: confdroid_automatic
+# Author: 12ww1160 (12ww1160@confdroid.com)
+# @summary Class manages services for the confdroid_automatic module
+##############################################################################
+class confdroid_automatic::monitoring::target (
+
+) inherits confdroid_automatic::params {
+  if $ac_manage_nagios == true {
+    @@nagios_service { "check_automatic_${fqdn}":
+      check_command       => "check_nrpe!check_automatic!${ac_procs_allowed}!automatic-service",
+      use                 => 'generic-service',
+      host_name           => $fqdn,
+      notification_period => '24x7',
+      service_description => "${fqdn}_check_automatic",
+      target              => $ac_target_service,
+      owner               => 'nagios',
+      group               => 'nagios',
+      mode                => '0640',
+      contacts            => $ac_target_contacts,
+    }
+}

manifests/params.pp

@@ -15,6 +15,10 @@
 # @param [String] ac_email_to where to send the email to
 # @param [String] ac_email_host which host to use to send the email
 # @param [Variant[String,Array[String]]] ac_excludepkgs packages to exclude from updates
+# @param [Boolean] ac_manage_nagios whether to manage nagios monitoring
+# @param [String] ac_target_service where to write the nagios service config
+# @param [String] ac_target_contacts which nagios contacts to use
+# @param [String] ac_procs_allowed how many processes are allowed to run
 ##############################################################################
 class confdroid_automatic::params (
 
@@ -33,6 +37,12 @@ class confdroid_automatic::params (
   String $ac_email_to                 = 'root@example.net',
   String $ac_email_host               = 'localhost',
 
+  # monitoring
+  Boolean $ac_manage_nagios           = false,
+  String $ac_target_service           = '/etc/nagios/conf.d/automatic_service.cfg',
+  String $ac_target_contacts          = 'nagiosadmin',
+  String $ac_procs_allowed            = '1:',
+
 ) {
 # Facts
   $fqdn                     = $facts['networking']['fqdn']