diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 683a7bf..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_alloy \
- -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_alloy.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/file.README.html b/doc/file.README.html
index 38d25ed..b246cfa 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -108,8 +108,6 @@
INSTALLATION
CONFIGURATION
diff --git a/doc/index.html b/doc/index.html
index e0bcfd9..d86683f 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -108,8 +108,6 @@
INSTALLATION
CONFIGURATION
diff --git a/doc/puppet_classes/confdroid_alloy_3A_3Aparams.html b/doc/puppet_classes/confdroid_alloy_3A_3Aparams.html
index 60f9ae3..d6844d3 100644
--- a/doc/puppet_classes/confdroid_alloy_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_alloy_3A_3Aparams.html
@@ -234,24 +234,6 @@
-
-
- ay_manage_ne
-
-
- (Boolean)
-
-
- (defaults to: false)
-
-
- —
-
-
whether to manage metric forwarding for the node exporter (external)
-
+
whether to honor timestamps in prometheus metrics
+
+
whether to track timestamps staleness in prometheus metrics
-17
-18
19
20
21
@@ -330,29 +346,29 @@
45
46
47
-48
+48
+49
- # File 'manifests/params.pp', line 17
+ # File 'manifests/params.pp', line 19
class confdroid_alloy::params (
- String $ay_reqpackages = 'alloy',
- String $ay_pkg_ensure = 'latest',
+ String $ay_reqpackages = 'alloy',
+ String $ay_pkg_ensure = 'latest',
# loki
- Boolean $ay_manage_loki = true,
- String $ay_loki_url = 'https://loki.example.net/loki/api/v1/push',
- String $ay_loki_username = 'loki_user',
- String $ay_loki_userpass = 'loki_pass',
- Array $ay_log_targets = ['/var/log/messages','/var/log/secure',],
+ Boolean $ay_manage_loki = true,
+ String $ay_loki_url = 'https://loki.example.net/loki/api/v1/push',
+ String $ay_loki_username = 'loki_user',
+ String $ay_loki_userpass = 'loki_pass',
+ Array $ay_log_targets = ['/var/log/messages','/var/log/secure',],
# prometheus
- Boolean $ay_manage_prom = true,
- String $ay_prom_url = 'https://prometheus.example.net/api/v1/write',
-
-# node exporter (external)
- Boolean $ay_manage_ne = false,
+ Boolean $ay_manage_prom = true,
+ String $ay_prom_url = 'https://prometheus.example.net/api/v1/write',
+ Boolean $ay_prom_honor_timestamps = true,
+ Boolean $ay_prom_track_timestamps_staleness = true,
) {
# service
|