3
0

Merge branch 'jenkins-build-24' into 'master'

Auto-merge for build 24

See merge request puppet/prometheus_cd!23
This commit is contained in:
2025-10-18 12:47:30 +00:00
3 changed files with 9 additions and 8 deletions

View File

@@ -154,10 +154,10 @@ class prometheus_cd::main::dirs (
owner => 'prometheus', owner => 'prometheus',
group => 'prometheus', group => 'prometheus',
mode => '0750', mode => '0750',
# selrange => s0, selrange => s0,
# selrole => object_r, selrole => object_r,
# seltype => etc_t, seltype => default_t,
# seluser => system_u, seluser => system_u,
} }
} }
}</pre> }</pre>

View File

@@ -24,10 +24,10 @@ class prometheus_cd::main::dirs (
owner => 'prometheus', owner => 'prometheus',
group => 'prometheus', group => 'prometheus',
mode => '0750', mode => '0750',
# selrange => s0, selrange => s0,
# selrole => object_r, selrole => object_r,
# seltype => etc_t, seltype => default_t,
# seluser => system_u, seluser => system_u,
} }
} }
} }

View File

@@ -9,6 +9,7 @@ global:
storage: storage:
tsdb: tsdb:
out_of_order_time_window: 5m out_of_order_time_window: 5m
path: <%= @ps_data_dir %>
alerting: alerting:
alertmanagers: alertmanagers:
- follow_redirects: true - follow_redirects: true