3
0
Commit Graph

169 Commits

Author SHA1 Message Date
ebc0c0af39 Merge remote-tracking branch 'origin/master' into jenkins-build-32 2025-10-18 16:31:27 +02:00
Arne Teuke
e487f2be18 add web config - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 16:30:54 +02:00
2c6000eb86 Merge branch 'jenkins-build-31' into 'master'
Auto-merge for build 31

See merge request puppet/prometheus_cd!30
2025-10-18 14:17:10 +00:00
2752300a43 Merge branch 'jenkins-build-30' into 'master'
Auto-merge for build 30

See merge request puppet/prometheus_cd!29
2025-10-18 14:17:01 +00:00
33dc15ceb6 Merge remote-tracking branch 'origin/master' into jenkins-build-31 2025-10-18 16:16:02 +02:00
Arne Teuke
72452b8236 fix format - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 16:15:24 +02:00
21be3a95f9 Merge remote-tracking branch 'origin/master' into jenkins-build-30 2025-10-18 16:14:28 +02:00
Arne Teuke
6017957f6c fix format - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 16:13:50 +02:00
b775a735d1 Merge branch 'jenkins-build-29' into 'master'
Auto-merge for build 29

See merge request puppet/prometheus_cd!28
2025-10-18 14:05:13 +00:00
16ac7b1752 Merge remote-tracking branch 'origin/master' into jenkins-build-29 2025-10-18 16:03:22 +02:00
Arne Teuke
0991d3ddb4 switch flags - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 16:02:47 +02:00
eb0d8f910e Merge branch 'jenkins-build-28' into 'master'
Auto-merge for build 28

See merge request puppet/prometheus_cd!27
2025-10-18 13:51:24 +00:00
35f8849e73 Recommit for updates in build 28 2025-10-18 15:48:33 +02:00
41ba97f64f Merge remote-tracking branch 'origin/master' into jenkins-build-28 2025-10-18 15:47:52 +02:00
Arne Teuke
dc68bd9766 add more flags - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 15:47:20 +02:00
c4cffe19e0 Merge branch 'jenkins-build-27' into 'master'
Auto-merge for build 27

See merge request puppet/prometheus_cd!26
2025-10-18 13:33:34 +00:00
b4ec13d69f Merge remote-tracking branch 'origin/master' into jenkins-build-27 2025-10-18 15:32:42 +02:00
Arne Teuke
04177496ab add service override file to allow config flags - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 15:32:17 +02:00
4f418d5fee Merge branch 'jenkins-build-26' into 'master'
Auto-merge for build 26

See merge request puppet/prometheus_cd!25
2025-10-18 13:30:54 +00:00
ede5319ac4 Recommit for updates in build 26 2025-10-18 15:30:37 +02:00
05c1054486 Merge remote-tracking branch 'origin/master' into jenkins-build-26 2025-10-18 15:29:53 +02:00
Arne Teuke
173fc542f8 add service override file to allow config flags - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 15:29:20 +02:00
83c55995a8 Merge branch 'jenkins-build-25' into 'master'
Auto-merge for build 25

See merge request puppet/prometheus_cd!24
2025-10-18 13:00:26 +00:00
16960c7618 Recommit for updates in build 25 2025-10-18 14:59:47 +02:00
799712b9d8 Merge remote-tracking branch 'origin/master' into jenkins-build-25 2025-10-18 14:59:07 +02:00
Arne Teuke
1dec72f087 remove storage path - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 14:58:10 +02:00
7fa7b310f6 Merge branch 'jenkins-build-24' into 'master'
Auto-merge for build 24

See merge request puppet/prometheus_cd!23
2025-10-18 12:47:30 +00:00
62016630ad Recommit for updates in build 24 2025-10-18 14:47:17 +02:00
7d0393a2d1 Merge remote-tracking branch 'origin/master' into jenkins-build-24 2025-10-18 14:46:37 +02:00
Arne Teuke
296f31f832 add storage path - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 14:46:06 +02:00
19ecee622b Merge branch 'jenkins-build-23' into 'master'
Auto-merge for build 23

See merge request puppet/prometheus_cd!22
2025-10-18 12:42:58 +00:00
9222c81959 Recommit for updates in build 23 2025-10-18 14:40:13 +02:00
c4880eca38 Merge remote-tracking branch 'origin/master' into jenkins-build-23 2025-10-18 14:39:32 +02:00
Arne Teuke
d86fda3514 fix dirs - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 14:39:07 +02:00
d807898514 Merge branch 'jenkins-build-22' into 'master'
Auto-merge for build 22

See merge request puppet/prometheus_cd!21
2025-10-18 12:36:24 +00:00
6b1b3f03ac Recommit for updates in build 22 2025-10-18 14:35:59 +02:00
b08668e537 Merge remote-tracking branch 'origin/master' into jenkins-build-22 2025-10-18 14:35:17 +02:00
Arne Teuke
336a8d9078 fix dirs - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 14:34:48 +02:00
3509216fd4 Merge branch 'jenkins-build-21' into 'master'
Auto-merge for build 21

See merge request puppet/prometheus_cd!20
2025-10-18 12:11:39 +00:00
f9b972414e Recommit for updates in build 21 2025-10-18 14:11:23 +02:00
1d05e8bfb2 Merge remote-tracking branch 'origin/master' into jenkins-build-21 2025-10-18 14:10:42 +02:00
Arne Teuke
03497c691e fix dirs - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 14:10:09 +02:00
6141ab59b8 Merge branch 'jenkins-build-20' into 'master'
Auto-merge for build 20

See merge request puppet/prometheus_cd!19
2025-10-18 12:08:41 +00:00
e48e7aa383 Recommit for updates in build 20 2025-10-18 14:08:27 +02:00
6e8620750c Merge remote-tracking branch 'origin/master' into jenkins-build-20 2025-10-18 14:07:47 +02:00
Arne Teuke
224198f624 fix template - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 14:07:20 +02:00
401d93735d Merge branch 'jenkins-build-19' into 'master'
Auto-merge for build 19

See merge request puppet/prometheus_cd!18
2025-10-18 12:01:11 +00:00
838685c7bf Recommit for updates in build 19 2025-10-18 14:00:43 +02:00
f5027db32c Merge remote-tracking branch 'origin/master' into jenkins-build-19 2025-10-18 13:59:57 +02:00
Arne Teuke
d69edd2891 fix notification - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 13:59:28 +02:00