Commit Graph

238 Commits

Author SHA1 Message Date
Jenkins
e229e5ed45 Merge branch 'jenkins-build-12' into 'master'
Auto-merge for build 12

See merge request puppet/alloy_cd!7
2025-07-18 11:22:05 +00:00
Jenkins Server
cd249e15fc Merge remote-tracking branch 'origin/master' into jenkins-build-12 2025-07-18 13:19:31 +02:00
Arne Teuke
fd638a276f update loki log level to info 2025-07-18 13:19:07 +02:00
Jenkins
834cf30fdd Merge branch 'jenkins-build-11' into 'master'
Auto-merge for build 11

See merge request puppet/alloy_cd!6
2025-06-13 15:18:55 +00:00
Jenkins Server
a1efbd6715 Merge remote-tracking branch 'origin/master' into jenkins-build-11 2025-06-13 17:16:27 +02:00
Arne Teuke
3bd4b55669 final setup 2025-06-13 17:16:08 +02:00
Jenkins
34736f529f Merge branch 'jenkins-build-10' into 'master'
Auto-merge for build 10

See merge request puppet/alloy_cd!5
2025-06-13 15:09:47 +00:00
Jenkins Server
46c93d1561 Merge remote-tracking branch 'origin/master' into jenkins-build-10 2025-06-13 17:01:57 +02:00
Arne Teuke
31fa60bd53 add option to include node exporter 2025-06-13 17:01:34 +02:00
Jenkins
2df266dac9 Merge branch 'jenkins-build-9' into 'master'
Auto-merge for build 9

See merge request puppet/alloy_cd!4
2025-06-13 14:45:53 +00:00
Jenkins Server
f5ebc7ba33 Merge remote-tracking branch 'origin/master' into jenkins-build-9 2025-06-13 16:45:03 +02:00
Arne Teuke
e4746d356a add option to include node exporter 2025-06-13 16:42:52 +02:00
Jenkins
888ad62fe1 Merge branch 'jenkins-build-7' into 'master'
Auto-merge for build 7

See merge request puppet/alloy_cd!3
2025-06-13 14:30:31 +00:00
Jenkins Server
017ef494b6 Merge remote-tracking branch 'origin/master' into jenkins-build-7 2025-06-13 16:29:15 +02:00
Arne Teuke
38f597d115 add option to include node exporter 2025-06-13 16:28:56 +02:00
Jenkins
a44a82ab57 Merge branch 'jenkins-build-6' into 'master'
Auto-merge for build 6

See merge request puppet/alloy_cd!2
2025-06-13 14:06:44 +00:00
Jenkins Server
7973d1ec96 Recommit for updates in build 6 2025-06-13 16:06:24 +02:00
Jenkins Server
e77d14928b Merge remote-tracking branch 'origin/master' into jenkins-build-6 2025-06-13 16:05:37 +02:00
Arne Teuke
7a1749a738 add option to include node exporter 2025-06-13 16:05:16 +02:00
Jenkins
7200fcb282 Merge branch 'jenkins-build-5' into 'master'
Auto-merge for build 5

See merge request puppet/alloy_cd!1
2025-06-05 14:37:01 +00:00
Jenkins Server
5d0f3cb5f4 Merge remote-tracking branch 'origin/master' into jenkins-build-5 2025-06-05 16:35:33 +02:00
Arne Teuke
2781df9d27 add new MR approach 2025-06-05 16:35:13 +02:00
Jenkins Server
4e9793519d Recommit for updates in build 4 2025-05-22 17:07:21 +02:00
Jenkins Server
183e479c75 Merge remote-tracking branch 'origin/master' into jenkins-build-4 2025-05-22 17:06:45 +02:00
Arne Teuke
fbc974c6cb fix build info and Readme 1.0.0 2025-05-22 17:06:22 +02:00
Jenkins Server
88b5407e15 recommit for updates in build 3 2025-05-06 13:32:30 +02:00
Arne Teuke
c64da1c9c6 adjust parameter type 2025-05-06 13:31:39 +02:00
Jenkins Server
fcaf1a9818 recommit for updates in build 1 2025-05-06 13:26:20 +02:00
Arne Teuke
0cdbaaf9db adjusted Jenkinsfile and Readme for the tests 2025-05-06 13:25:20 +02:00
Jenkins ConfDroid
94aca16670 Merge branch 'master' of gitlab.confdroid.com:puppet/alloy_cd into HEAD 2025-04-23 17:44:09 +02:00
Arne Teuke
5ce3077925 update Jenkinsfile with new connection 2025-04-23 17:42:52 +02:00
Jenkins ConfDroid
1ebb4a62de Merge branch 'master' of sourcecode.confdroid.com:puppet/alloy-cd into HEAD 2025-03-16 23:18:18 +01:00
Arne Teuke
38b5af8009 update token 2025-03-16 23:17:53 +01:00
Jenkins ConfDroid
d77c09e462 recommit for updates in build 49 2025-03-12 14:55:00 +01:00
Jenkins ConfDroid
3d9cae81ed Merge branch 'master' of sourcecode.confdroid.com:puppet/alloy-cd into HEAD 2025-03-12 14:54:33 +01:00
Arne Teuke
41df4dc281 update Readme 2025-03-12 14:54:10 +01:00
Jenkins ConfDroid
c7bd9be334 Merge branch 'master' of sourcecode.confdroid.com:puppet/alloy-cd into HEAD 2025-03-12 14:19:09 +01:00
Arne Teuke
554bfdbf69 revert prometheus static labels fqdn 2025-03-12 14:18:45 +01:00
Jenkins ConfDroid
44095fa2c3 recommit for updates in build 47 2025-03-12 14:11:19 +01:00
Jenkins ConfDroid
773f8f22dd Merge branch 'master' of sourcecode.confdroid.com:puppet/alloy-cd into HEAD 2025-03-12 14:10:53 +01:00
Arne Teuke
0b2b6fedc2 add prometheus static labels fqdn 2025-03-12 14:10:29 +01:00
Jenkins ConfDroid
574e137091 Merge branch 'master' of sourcecode.confdroid.com:puppet/alloy-cd into HEAD 2025-03-11 17:06:12 +01:00
Arne Teuke
17aae3e03e working fqdn debug level 2025-03-11 17:05:50 +01:00
Jenkins ConfDroid
a0576db789 Merge branch 'master' of sourcecode.confdroid.com:puppet/alloy-cd into HEAD 2025-03-11 17:02:31 +01:00
Arne Teuke
a091192d5a working fqdn 2025-03-11 17:02:10 +01:00
Jenkins ConfDroid
2a6f344c33 Merge branch 'master' of sourcecode.confdroid.com:puppet/alloy-cd into HEAD 2025-03-11 16:53:38 +01:00
Arne Teuke
95fde97154 working instance 2025-03-11 16:53:15 +01:00
Arne Teuke
2b0bd7788a working instance 2025-03-11 16:51:44 +01:00
Jenkins ConfDroid
ade0977b58 Merge branch 'master' of sourcecode.confdroid.com:puppet/alloy-cd into HEAD 2025-03-11 16:31:31 +01:00
Arne Teuke
a3408c7882 journal hostname label 2025-03-11 16:31:09 +01:00