Recommit for updates in build 28

Jenkinsfile

@@ -1,128 +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_puppet \
-                -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_puppet.git
-                  git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                  push master --mirror
-                  '''
-            }
-          }
-        }
-      }
-    }
-  }
-}

doc/puppet_classes/confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html

@@ -135,7 +135,24 @@
 37
 38
 39
-40</pre>
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
@@ -161,7 +178,7 @@ class confdroid_puppet::monitoring::target (
     if $fqdn == $pt_pm_fqdn {
       # puppet server service
       @@nagios_service { &quot;check_puppet_server_${fqdn}&quot;:
-        check_command       =&gt; &quot;check_nrpe!check_puppet_server!${pt_procs_allowed}!puppet&quot;,
+        check_command       =&gt; &quot;check_nrpe!check_puppet_server!${pt_procs_allowed}!puppetserver&quot;,
         use                 =&gt; &#39;generic-service&#39;,
         host_name           =&gt; $fqdn,
         notification_period =&gt; &#39;24x7&#39;,
@@ -173,6 +190,23 @@ class confdroid_puppet::monitoring::target (
         contacts            =&gt; $pt_target_contacts,
       }
     }
+
+    if $fqdn == $pt_puppetdb_fqdn and $pt_use_puppetdb == true {
+      # puppetdb service
+      @@nagios_service { &quot;check_puppetdb_${fqdn}&quot;:
+        check_command       =&gt; &quot;check_nrpe!check_puppetdb!${pt_procs_allowed}!puppetdb&quot;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $fqdn,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &quot;${fqdn}_check_puppetdb&quot;,
+        target              =&gt; $pt_target_service,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;0640&#39;,
+        contacts            =&gt; $pt_target_contacts,
+      }
+    }
+
   }
 }</pre>
       </td>

manifests/monitoring/target.pp

@@ -36,5 +36,22 @@ class confdroid_puppet::monitoring::target (
         contacts            => $pt_target_contacts,
       }
     }
+
+    if $fqdn == $pt_puppetdb_fqdn and $pt_use_puppetdb == true {
+      # puppetdb service
+      @@nagios_service { "check_puppetdb_${fqdn}":
+        check_command       => "check_nrpe!check_puppetdb!${pt_procs_allowed}!puppetdb",
+        use                 => 'generic-service',
+        host_name           => $fqdn,
+        notification_period => '24x7',
+        service_description => "${fqdn}_check_puppetdb",
+        target              => $pt_target_service,
+        owner               => 'nagios',
+        group               => 'nagios',
+        mode                => '0640',
+        contacts            => $pt_target_contacts,
+      }
+    }
+
   }
 }