From 17c76e14ca6d9adc218d0077f554e17b80de0c75 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 4 Oct 2026 13:27:36 +0200 Subject: [PATCH] Recommit for updates in build 31 --- Jenkinsfile | 127 ------------------ .../confdroid_ntp_3A_3Amain_3A_3Aconfig.html | 6 +- ...droid_ntp_3A_3Amonitoring_3A_3Atarget.html | 30 ++++- .../confdroid_ntp_3A_3Aparams.html | 96 ++++++++++++- 4 files changed, 122 insertions(+), 137 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 77dcd42..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_ntp \ - -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_ntp.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/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Aconfig.html index 2e52ed9..b118542 100644 --- a/doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Aconfig.html @@ -119,9 +119,9 @@ class confdroid_ntp::main::config ( ) inherits confdroid_ntp::params { include confdroid_ntp::main::service -# if $ay_manage_nagios == true { -# include confdroid_ntp::monitoring::target -# } + if $cy_manage_nagios == true { + include confdroid_ntp::monitoring::target + } } diff --git a/doc/puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html b/doc/puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html index 2e79b2d..3431503 100644 --- a/doc/puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html +++ b/doc/puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html @@ -104,7 +104,21 @@ 6 7 8 -9 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 
# File 'manifests/monitoring/target.pp', line 6
@@ -112,6 +126,20 @@
 class confdroid_ntp::monitoring::target (
 
 ) inherits confdroid_ntp::params {
+  if $cy_manage_nagios == true {
+    @@nagios_service { "check_chronyd_${fqdn}":
+      check_command       => "check_nrpe!check_chronyd!${cy_procs_allowed}!chrony",
+      use                 => 'generic-service',
+      host_name           => $fqdn,
+      notification_period => '24x7',
+      service_description => "${fqdn}_check_chronyd",
+      target              => $cy_target_service,
+      owner               => 'nagios',
+      group               => 'nagios',
+      mode                => '0640',
+      contacts            => $cy_target_contacts,
+    }
+  }
 }
diff --git a/doc/puppet_classes/confdroid_ntp_3A_3Aparams.html b/doc/puppet_classes/confdroid_ntp_3A_3Aparams.html index 6f0198f..77fd777 100644 --- a/doc/puppet_classes/confdroid_ntp_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_ntp_3A_3Aparams.html @@ -284,6 +284,78 @@ —

Whether to use a local LAN server or external pool.

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

    Whether to manage Nagios monitoring for the module.

    +
    + +
    • + +
  • + + cy_procs_allowed + + + (String) + + + (defaults to: '1') + + + — +
    +

    Number of allowed processes for the Nagios check.

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

    Path to the Nagios service configuration file.

    +
    + +
    • + +
  • + + cy_target_contacts + + + (Array) + + + (defaults to: ['admin']) + + + — +
    +

    List of Nagios contacts for notifications.

    • @@ -299,10 +371,6 @@ 
     
 
-22
-23
-24
-25
 26
 27
 28
@@ -336,10 +404,20 @@
 56
 57
 58
-59
    +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 - 
    # File 'manifests/params.pp', line 22
+        
    # File 'manifests/params.pp', line 26
 
 class confdroid_ntp::params (
 
@@ -357,6 +435,12 @@ class confdroid_ntp::params (
   String $cy_leapsectz        = 'right/UTC',
   String $cy_loginfo          = 'measurements statistics tracking',
 
+# monitoring
+  Boolean $cy_manage_nagios   = false,
+  String $cy_procs_allowed    = '1',
+  String $cy_target_service   = '/etc/nagios/conf.d/chronyd_service.cfg',
+  Array $cy_target_contacts   = ['admin'],
+
 ) {
 # facts
   $fqdn                       = $facts['networking']['fqdn']