diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 2ea123e..0000000 --- a/Jenkinsfile +++ /dev/null @@ -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 - ''' - } - } - } - } - } - } -} \ No newline at end of file diff --git a/doc/_index.html b/doc/_index.html index dff28cb..d6fdd67 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -98,6 +98,11 @@ +
  • + confdroid_automatic::monitoring::target + +
    • +
  • confdroid_automatic::params diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 76a52aa..90a0d05 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -78,7 +78,14 @@
    • -
  • +
  • +
    + confdroid_automatic::monitoring::target +
    +
    • + + +
  • confdroid_automatic::params
    diff --git a/doc/puppet_classes/confdroid_automatic_3A_3Amonitoring_3A_3Atarget.html b/doc/puppet_classes/confdroid_automatic_3A_3Amonitoring_3A_3Atarget.html new file mode 100644 index 0000000..ba222c5 --- /dev/null +++ b/doc/puppet_classes/confdroid_automatic_3A_3Amonitoring_3A_3Atarget.html @@ -0,0 +1,156 @@ + + + + + + + Puppet Class: confdroid_automatic::monitoring::target + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: confdroid_automatic::monitoring::target

    +
    + +
    +
    Inherits:
    +
    confdroid_automatic::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/monitoring/target.pp +
    +
    +
    + +

    Summary

    + Class manages services for the confdroid_automatic module + +

    Overview

    +
    +
    + +

    confdroid_automatic::monitoring::target.pp Module name: confdroid_automatic Author: 12ww1160 (12ww1160@confdroid.com)

    + +
    +
    + + + +
    + + + +
    + + + + + +
    + 
    +
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
    +     		+ 
    # File 'manifests/monitoring/target.pp', line 6
+
+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,
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file diff --git a/doc/puppet_classes/confdroid_automatic_3A_3Aparams.html b/doc/puppet_classes/confdroid_automatic_3A_3Aparams.html index d6e7496..88d68bc 100644 --- a/doc/puppet_classes/confdroid_automatic_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_automatic_3A_3Aparams.html @@ -77,6 +77,8 @@ confdroid_automatic::main::service
    + confdroid_automatic::monitoring::target
    + diff --git a/manifests/monitoring/target.pp b/manifests/monitoring/target.pp index 11aef33..c99bacb 100644 --- a/manifests/monitoring/target.pp +++ b/manifests/monitoring/target.pp @@ -19,4 +19,5 @@ class confdroid_automatic::monitoring::target ( mode => '0640', contacts => $ac_target_contacts, } + } }