Recommit for updates in build 70

Jenkinsfile

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

doc/puppet_classes/confdroid_nrpe_3A_3Acommands_3A_3Adefinition_rules.html

@@ -181,7 +181,37 @@
 77
 78
 79
-80</pre>
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/commands/definition_rules.pp', line 12</span>
@@ -251,8 +281,38 @@ class confdroid_nrpe::commands::definition_rules (
     confdroid_nrpe::commands::definitions { &#39;check_fail2ban&#39;:
       ne_check_name    =&gt; &#39;check_fail2ban&#39;,
       ne_check_cmd     =&gt; &#39;check_procs&#39;,
+      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
+    }
+    confdroid_nrpe::commands::definitions { &#39;check_alloy&#39;:
+      ne_check_name    =&gt; &#39;check_alloy&#39;,
+      ne_check_cmd     =&gt; &#39;check_procs&#39;,
+      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
+    }
+    confdroid_nrpe::commands::definitions { &#39;check_haproxy&#39;:
+      ne_check_name    =&gt; &#39;check_haproxy&#39;,
+      ne_check_cmd     =&gt; &#39;check_procs&#39;,
+      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
+    }
+    confdroid_nrpe::commands::definitions { &#39;check_puppet&#39;:
+      ne_check_name    =&gt; &#39;check_puppet&#39;,
+      ne_check_cmd     =&gt; &#39;check_procs&#39;,
+      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
+    }
+    confdroid_nrpe::commands::definitions { &#39;check_puppet_server&#39;:
+      ne_check_name    =&gt; &#39;check_puppet_server&#39;,
+      ne_check_cmd     =&gt; &#39;check_procs&#39;,
       ne_cmd_argstring =&gt; &#39;-c $ARG1$ -a $ARG2$&#39;,
     }
+    confdroid_nrpe::commands::definitions { &#39;check_puppetdb&#39;:
+      ne_check_name    =&gt; &#39;check_puppetdb&#39;,
+      ne_check_cmd     =&gt; &#39;check_procs&#39;,
+      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -a $ARG2$&#39;,
+    }
+    confdroid_nrpe::commands::definitions { &#39;check_sshd&#39;:
+      ne_check_name    =&gt; &#39;check_sshd&#39;,
+      ne_check_cmd     =&gt; &#39;check_procs&#39;,
+      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
+    }
   }
 }</pre>
       </td>

manifests/commands/definition_rules.pp

@@ -74,12 +74,37 @@ class confdroid_nrpe::commands::definition_rules (
     confdroid_nrpe::commands::definitions { 'check_fail2ban':
       ne_check_name    => 'check_fail2ban',
       ne_check_cmd     => 'check_procs',
-      ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
+      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
     }
     confdroid_nrpe::commands::definitions { 'check_alloy':
       ne_check_name    => 'check_alloy',
       ne_check_cmd     => 'check_procs',
+      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
+    }
+    confdroid_nrpe::commands::definitions { 'check_haproxy':
+      ne_check_name    => 'check_haproxy',
+      ne_check_cmd     => 'check_procs',
+      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
+    }
+    confdroid_nrpe::commands::definitions { 'check_puppet':
+      ne_check_name    => 'check_puppet',
+      ne_check_cmd     => 'check_procs',
+      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
+    }
+    confdroid_nrpe::commands::definitions { 'check_puppet_server':
+      ne_check_name    => 'check_puppet_server',
+      ne_check_cmd     => 'check_procs',
       ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
     }
+    confdroid_nrpe::commands::definitions { 'check_puppetdb':
+      ne_check_name    => 'check_puppetdb',
+      ne_check_cmd     => 'check_procs',
+      ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
+    }
+    confdroid_nrpe::commands::definitions { 'check_sshd':
+      ne_check_name    => 'check_sshd',
+      ne_check_cmd     => 'check_procs',
+      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
+    }
   }
 }