confdroid/confdroid_puppet
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Recommit for updates in build 26

Browse Source
This commit is contained in:
Jenkins Server
2026-09-08 13:11:27 +02:00
parent a030071dfc
commit 6c99964366
4 changed files with 61 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
Jenkinsfile vendored
View File

@@ -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
'''
}
}
}
}
}
}
}

13
doc/file.README.html
View File

@@ -76,6 +76,8 @@
</li><li>
<p><a href="#directories-files-and-services">Directories, Files and Services</a></p>
</li><li>
<p><a href="#nagios-monitoring">Nagios monitoring</a></p>
</li><li>
<p><a href="#optional">Optional</a></p>
</li><li>
<p><a href="#r10k-service">R10k service</a></p>
@@ -147,6 +149,17 @@
<p>start services as required</p>
</li></ul>
<h3 id="label-Nagios+monitoring">Nagios monitoring</h3>
<p>When <code>$pt_manage_nagios</code> is <code>true</code>, the module exports a Puppet agent check on every node and a Puppet Server check on the Puppet Server node. The target Nagios installation must provide the NRPE command alias used by the export. The Puppet Server check can use the standard <code>check_procs</code> plugin:</p>
<pre class="code ruby"><code class="ruby">command[check_puppet_server]=/usr/lib64/nagios/plugins/check_procs -c $ARG1$ -a $ARG2$
</code></pre>
<p>With the exported command, <code>check_puppet_server!1:!puppetserver</code> alerts when no running process has <code>puppetserver</code> in its full command line. It does not check whether the systemd service is enabled.</p>
<p>The modules <code>confdroid_nagios</code> and <code>confdroid_nrpe</code> include the proper commands already.</p>
<h3 id="label-Optional">Optional</h3>
<h4 id="label-R10k+service">R10k service</h4>

13
doc/index.html
View File

@@ -76,6 +76,8 @@
</li><li>
<p><a href="#directories-files-and-services">Directories, Files and Services</a></p>
</li><li>
<p><a href="#nagios-monitoring">Nagios monitoring</a></p>
</li><li>
<p><a href="#optional">Optional</a></p>
</li><li>
<p><a href="#r10k-service">R10k service</a></p>
@@ -147,6 +149,17 @@
<p>start services as required</p>
</li></ul>
<h3 id="label-Nagios+monitoring">Nagios monitoring</h3>
<p>When <code>$pt_manage_nagios</code> is <code>true</code>, the module exports a Puppet agent check on every node and a Puppet Server check on the Puppet Server node. The target Nagios installation must provide the NRPE command alias used by the export. The Puppet Server check can use the standard <code>check_procs</code> plugin:</p>
<pre class="code ruby"><code class="ruby">command[check_puppet_server]=/usr/lib64/nagios/plugins/check_procs -c $ARG1$ -a $ARG2$
</code></pre>
<p>With the exported command, <code>check_puppet_server!1:!puppetserver</code> alerts when no running process has <code>puppetserver</code> in its full command line. It does not check whether the systemd service is enabled.</p>
<p>The modules <code>confdroid_nagios</code> and <code>confdroid_nrpe</code> include the proper commands already.</p>
<h3 id="label-Optional">Optional</h3>
<h4 id="label-R10k+service">R10k service</h4>

36
doc/puppet_classes/confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html
View File

@@ -118,7 +118,24 @@
20
21
22
23</pre>
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
@@ -127,6 +144,7 @@ class confdroid_puppet::monitoring::target (
) inherits confdroid_puppet::params {
if $pt_manage_nagios == true {
# puppet agent service
@@nagios_service { &quot;check_puppet_${fqdn}&quot;:
check_command =&gt; &quot;check_nrpe!check_puppet!${pt_procs_allowed}!puppet&quot;,
use =&gt; &#39;generic-service&#39;,
@@ -139,6 +157,22 @@ class confdroid_puppet::monitoring::target (
mode =&gt; &#39;0640&#39;,
contacts =&gt; $pt_target_contacts,
}
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;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $fqdn,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${fqdn}_check_puppet_server&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>