From 1dec72f08747fb703800d27bc55e500a9e4890d2 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sat, 18 Oct 2025 14:58:10 +0200 Subject: [PATCH] remove storage path - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 --- manifests/main/dirs.pp | 11 ----------- manifests/params.pp | 2 -- templates/prometheus.yml.erb | 1 - 3 files changed, 14 deletions(-) diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index fa84da8..31126c6 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -18,16 +18,5 @@ class prometheus_cd::main::dirs ( seltype => etc_t, seluser => system_u, } - # data directory - file { $ps_data_dir: - ensure => directory, - owner => 'prometheus', - group => 'prometheus', - mode => '0750', - selrange => s0, - selrole => object_r, - seltype => default_t, - seluser => system_u, - } } } diff --git a/manifests/params.pp b/manifests/params.pp index 9e54376..c6f0a22 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -13,7 +13,6 @@ # @param [String] ps_main_port the firewall main port for prometheus # @param [String] ps_auth_user the username for authentication # @param [String] ps_auth_pass the password for authentication -# @param [String] ps_data_dir the data directory for prometheus ############################################################################## class prometheus_cd::params ( @@ -27,7 +26,6 @@ class prometheus_cd::params ( Boolean $manage_node_exporter = false, Boolean $ps_manage_fw = false, String $ps_prom_host = 'prometheus.example.net', - String $ps_data_dir = '/data/prometheus', # firewall String $ps_fw_prefix = '50', diff --git a/templates/prometheus.yml.erb b/templates/prometheus.yml.erb index 53a720b..9c8521a 100644 --- a/templates/prometheus.yml.erb +++ b/templates/prometheus.yml.erb @@ -9,7 +9,6 @@ global: storage: tsdb: out_of_order_time_window: 5m - path: <%= @ps_data_dir %> alerting: alertmanagers: - follow_redirects: true