diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index da6afef..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,135 +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_nagios \
- -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_nagios.git
- git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
- push master --mirror
- '''
- }
- }
- }
- }
- }
- }
-}
-
diff --git a/README.md b/README.md
index 859f7e8..294f203 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
- [Synopsis](#synopsis)
- [WARNING](#warning)
- [Features](#features)
+ - [Currently included custom checks](#currently-included-custom-checks)
- [Repo Documentation](#repo-documentation)
- [Dependencies](#dependencies)
- [Deployment](#deployment)
@@ -52,6 +53,32 @@ At this stage, the module is being redeveloped and being built to the latest sta
- if `ng_include_nrpe`is set to `true`, the confdroid_nrpe module is automatically applied on clients ([confdroid_nrpe](https://sourcecode.confdroid.com/confdroid/confdroid_nrpe) must be in the catalogue then)
- if `ng_enable_fail2ban`is set to `true`, a fail2ban jail and filter will be added for the Nagios service (requires confdroid_fail2ban).
+### Currently included custom checks
+
+The current nagios checks are included via `manifests/nagios/commands.pp`:
+
+- `check-host-alive`
+- `check_disk`
+- `check_local_load`
+- `check_local_procs`
+- `check_local_users`
+- `check_local_swap`
+- `check_ftp`
+- `check_snmp`
+- `check_http`
+- `check_ssh`
+- `check_ping`
+- `check_tcp`
+- `check_udp`
+- `check_nrpe`
+- `check_nagios`
+- `check_bandwidth`
+- `process-service-perfdata-file`
+- `process-host-perfdata-file`
+- `check_ntp_time`
+- `check_fail2ban`
+- `check_alloy`
+
## Repo Documentation
See the full Puppet documentation including parameters in `docs/index.html`
diff --git a/doc/file.README.html b/doc/file.README.html
index 8aaaab4..f2159dd 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -69,6 +69,9 @@
WARNING
Features
+
Repo Documentation
@@ -145,6 +148,53 @@
if ng_enable_fail2banis set to true, a fail2ban jail and filter will be added for the Nagios service (requires confdroid_fail2ban).
+Currently included custom checks
+
+The current nagios checks are included via manifests/nagios/commands.pp:
+
+
Repo Documentation
See the full Puppet documentation including parameters in docs/index.html
diff --git a/doc/index.html b/doc/index.html
index db0e2eb..de0ac40 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -69,6 +69,9 @@
WARNING
Features
+
Repo Documentation
@@ -145,6 +148,53 @@
if ng_enable_fail2banis set to true, a fail2ban jail and filter will be added for the Nagios service (requires confdroid_fail2ban).
+Currently included custom checks
+
+The current nagios checks are included via manifests/nagios/commands.pp:
+
+
Repo Documentation
See the full Puppet documentation including parameters in docs/index.html