Recommit for updates in build 63
This commit is contained in:
@@ -104,7 +104,13 @@
|
||||
6
|
||||
7
|
||||
8
|
||||
9</pre>
|
||||
9
|
||||
10
|
||||
11
|
||||
12
|
||||
13
|
||||
14
|
||||
15</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
|
||||
@@ -112,6 +118,12 @@
|
||||
class prometheus_cd::main::config (
|
||||
) inherits prometheus_cd::params {
|
||||
include prometheus_cd::main::service
|
||||
|
||||
exec { 'systemd-daemon-reload':
|
||||
command => '/bin/systemctl daemon-reload',
|
||||
path => ['/bin', '/usr/bin'],
|
||||
refreshonly => true,
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -179,7 +179,33 @@
|
||||
81
|
||||
82
|
||||
83
|
||||
84</pre>
|
||||
84
|
||||
85
|
||||
86
|
||||
87
|
||||
88
|
||||
89
|
||||
90
|
||||
91
|
||||
92
|
||||
93
|
||||
94
|
||||
95
|
||||
96
|
||||
97
|
||||
98
|
||||
99
|
||||
100
|
||||
101
|
||||
102
|
||||
103
|
||||
104
|
||||
105
|
||||
106
|
||||
107
|
||||
108
|
||||
109
|
||||
110</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||
@@ -247,18 +273,44 @@ class prometheus_cd::main::files (
|
||||
seltype => usr_,
|
||||
seluser => unconfined_u,
|
||||
content => template('prometheus_cd/prune.env.erb'),
|
||||
# notify Service ToDo,
|
||||
}
|
||||
file { $ps_pruning_svc_file:
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => systemd_unit_file_t,
|
||||
seluser => unconfined_u,
|
||||
content => template('prometheus_cd/prometheus-prune-service.erb'),
|
||||
notify => Exec['systemd-daemon-reload'],
|
||||
}
|
||||
file { $ps_pruning_timer_file:
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => systemd_unit_file_t,
|
||||
seluser => unconfined_u,
|
||||
content => template('prometheus_cd/prometheus-prune-timer.erb'),
|
||||
notify => Exec['systemd-daemon-reload'],
|
||||
}
|
||||
}
|
||||
|
||||
if $ps_enable_pruning == false {
|
||||
file { $ps_pruning_file:
|
||||
ensure => absent,
|
||||
# notify Service ToDo,
|
||||
ensure => absent,
|
||||
notify => Exec['systemd-daemon-reload'],
|
||||
}
|
||||
file { $ps_env_file:
|
||||
ensure => absent,
|
||||
# notify Service ToDo,
|
||||
}
|
||||
file { $ps_pruning_svc_file:
|
||||
ensure => absent,
|
||||
notify => Exec['systemd-daemon-reload'],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,7 +121,31 @@
|
||||
23
|
||||
24
|
||||
25
|
||||
26</pre>
|
||||
26
|
||||
27
|
||||
28
|
||||
29
|
||||
30
|
||||
31
|
||||
32
|
||||
33
|
||||
34
|
||||
35
|
||||
36
|
||||
37
|
||||
38
|
||||
39
|
||||
40
|
||||
41
|
||||
42
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
47
|
||||
48
|
||||
49
|
||||
50</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
|
||||
@@ -146,6 +170,30 @@ class prometheus_cd::main::service (
|
||||
enable => true,
|
||||
}
|
||||
}
|
||||
if $ps_enable_pruning == true {
|
||||
service { $ps_prune_service:
|
||||
ensure => running,
|
||||
hasstatus => true,
|
||||
hasrestart => true,
|
||||
enable => true,
|
||||
}
|
||||
service { $ps_prune_timer:
|
||||
ensure => running,
|
||||
hasstatus => true,
|
||||
hasrestart => true,
|
||||
enable => true,
|
||||
}
|
||||
}
|
||||
if $ps_enable_pruning == false {
|
||||
service { $ps_prune_service:
|
||||
ensure => stopped,
|
||||
enable => true,
|
||||
}
|
||||
service { $ps_prune_timer:
|
||||
ensure => stopped,
|
||||
enable => true,
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -885,7 +885,12 @@
|
||||
121
|
||||
122
|
||||
123
|
||||
124</pre>
|
||||
124
|
||||
125
|
||||
126
|
||||
127
|
||||
128
|
||||
129</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 44</span>
|
||||
@@ -958,15 +963,20 @@ class prometheus_cd::params (
|
||||
# dirs
|
||||
$ps_main_dir = '/etc/prometheus'
|
||||
$ps_system_file_dir = '/etc/systemd/system/prometheus.service.d'
|
||||
$ps_system_dir = '/etc/systemd/system/'
|
||||
|
||||
# files
|
||||
$ps_main_file = "${ps_main_dir}/prometheus.yml"
|
||||
$ps_web_config_file = "${ps_main_dir}/web.yml"
|
||||
$ps_system_service_file = "${ps_system_file_dir}/override.conf"
|
||||
$ps_pruning_svc_file = "${ps_system_dir}/prometheus-prune.service"
|
||||
$ps_pruning_timer_file = "${ps_system_dir}/prometheus-prune.timer"
|
||||
|
||||
# services
|
||||
$ps_prom_service = 'prometheus'
|
||||
$ps_ne_service = 'node_exporter'
|
||||
$ps_prune_service = 'prometheus-prune.service'
|
||||
$ps_prune_timer = 'prometheus-prune.timer'
|
||||
|
||||
# includes must be last
|
||||
include prometheus_cd::main::config
|
||||
|
||||
Reference in New Issue
Block a user