From 8a03b183cc0de0a465d1740b3d3c535068f30ebe Mon Sep 17 00:00:00 2001 From: 12ww1160 Date: Wed, 3 Dec 2025 12:44:13 +0100 Subject: [PATCH 1/2] OP#180 add more tsdb options --- .vscode/settings.json | 1 + Jenkinsfile | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index c808a20..52e6580 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "cSpell.words": [ "changeme", + "GITEA", "GOMAXPROCS", "procs", "reqpackage", diff --git a/Jenkinsfile b/Jenkinsfile index 9de032c..88fa7e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,5 +101,27 @@ pipeline { } } } + + stage('Mirror to Gitea') { + steps { + 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 remote add master https://gitea.confdroid.com/confdroid/prometheus_cd.git + git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ + push master --mirror + ''' + } + } + } + } } } \ No newline at end of file From 084f139d645a26dea8f633c2afc50673ae568ee1 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 3 Dec 2025 12:45:25 +0100 Subject: [PATCH 2/2] Recommit for updates in build 39 --- .../prometheus_cd_3A_3Aparams.html | 48 +++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html index 9ca1221..ea4bd10 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html @@ -380,6 +380,42 @@ +
  • + + ps_min_block_dur + + + (String) + + + (defaults to: '2h') + + + — +
    +

    tsdb minimum block duration

    +
    + +
  • + +
  • + + ps_max_block_dur + + + (String) + + + (defaults to: '2h') + + + — +
    +

    tsdb maximum block duration

    +
    + +
  • +
  • ps_max_mem @@ -481,8 +517,6 @@
     
     
    -26
    -27
     28
     29
     30
    @@ -537,10 +571,14 @@
     79
     80
     81
    -82
    +82 +83 +84 +85 +86 -
    # File 'manifests/params.pp', line 26
    +        
    # File 'manifests/params.pp', line 28
     
     class prometheus_cd::params (
     
    @@ -568,6 +606,8 @@ class prometheus_cd::params (
       String $ps_retention_time     = '15d',
       String $ps_retention_size     = '20GB',
       String $ps_wal_seg_size       = '50MB',
    +  String $ps_min_block_dur      = '2h',
    +  String $ps_max_block_dur      = '2h',
     
       # service
       String $ps_max_mem            = '6G',