Compare commits
4 Commits
6d01996da5
...
a6fa3c098b
| Author | SHA1 | Date | |
|---|---|---|---|
|
a6fa3c098b | ||
|
|
8f394b726b | ||
| eab95a5b54 | |||
|
|
677b311a64 |
127
Jenkinsfile
vendored
127
Jenkinsfile
vendored
@@ -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
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -108,8 +108,6 @@
|
||||
<p>INSTALLATION</p>
|
||||
<ul><li>
|
||||
<p>installs alloy binaries</p>
|
||||
</li><li>
|
||||
<p>installs node exporter (optional, set <code>ay_manage_ne</code>to <code>true</code>)</p>
|
||||
</li></ul>
|
||||
|
||||
<p>CONFIGURATION</p>
|
||||
|
||||
@@ -108,8 +108,6 @@
|
||||
<p>INSTALLATION</p>
|
||||
<ul><li>
|
||||
<p>installs alloy binaries</p>
|
||||
</li><li>
|
||||
<p>installs node exporter (optional, set <code>ay_manage_ne</code>to <code>true</code>)</p>
|
||||
</li></ul>
|
||||
|
||||
<p>CONFIGURATION</p>
|
||||
|
||||
@@ -234,24 +234,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ay_manage_ne</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>false</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to manage metric forwarding for the node exporter (external)</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ay_prom_url</span>
|
||||
@@ -284,6 +266,96 @@
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the logging targets</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ay_prom_honor_timestamps</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to honor timestamps in prometheus metrics</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ay_prom_track_timestamps_staleness</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to track timestamps staleness in prometheus metrics</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ay_prom_max_shards</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'10'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the maximum number of shards to use for prometheus metrics</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ay_prom_max_samples_per_send</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'2000'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the maximum number of samples to send</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ay_prom_batch_send_deadline</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'5s'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the maximum time to wait before sending</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
@@ -299,11 +371,6 @@
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
17
|
||||
18
|
||||
19
|
||||
20
|
||||
21
|
||||
22
|
||||
23
|
||||
24
|
||||
@@ -330,29 +397,38 @@
|
||||
45
|
||||
46
|
||||
47
|
||||
48</pre>
|
||||
48
|
||||
49
|
||||
50
|
||||
51
|
||||
52
|
||||
53
|
||||
54
|
||||
55</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 17</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 22</span>
|
||||
|
||||
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,
|
||||
String $ay_prom_max_shards = '10',
|
||||
String $ay_prom_max_samples_per_send = '2000',
|
||||
String $ay_prom_batch_send_deadline = '5s',
|
||||
|
||||
) {
|
||||
# service
|
||||
|
||||
@@ -14,6 +14,9 @@
|
||||
# timestamps in prometheus metrics
|
||||
# @param [Boolean] ay_prom_track_timestamps_staleness whether to track timestamps
|
||||
# staleness in prometheus metrics
|
||||
# @param [String] ay_prom_max_shards the maximum number of shards to use for prometheus metrics
|
||||
# @param [String] ay_prom_max_samples_per_send the maximum number of samples to send
|
||||
# @param [String] ay_prom_batch_send_deadline the maximum time to wait before sending
|
||||
# @summary Class contains all parameters for the confdroid_alloy module.
|
||||
##############################################################################
|
||||
class confdroid_alloy::params (
|
||||
@@ -33,6 +36,9 @@ class confdroid_alloy::params (
|
||||
String $ay_prom_url = 'https://prometheus.example.net/api/v1/write',
|
||||
Boolean $ay_prom_honor_timestamps = true,
|
||||
Boolean $ay_prom_track_timestamps_staleness = true,
|
||||
String $ay_prom_max_shards = '10',
|
||||
String $ay_prom_max_samples_per_send = '2000',
|
||||
String $ay_prom_batch_send_deadline = '5s',
|
||||
|
||||
) {
|
||||
# service
|
||||
|
||||
@@ -94,6 +94,11 @@ prometheus.remote_write "prometheus" {
|
||||
username = "<%= @ay_loki_username %>"
|
||||
password = "<%= @ay_loki_userpass %>"
|
||||
}
|
||||
queue_config {
|
||||
max_shards = <%= @ay_prom_max_shards %>
|
||||
max_samples_per_send = <%= @ay_prom_max_samples_per_send %>
|
||||
batch_send_deadline = <%= @ay_prom_batch_send_deadline %>
|
||||
}
|
||||
}
|
||||
}
|
||||
<% end %>
|
||||
Reference in New Issue
Block a user