Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F7163600
D8097.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Subscribers
None
D8097.id.diff
View Options
diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -3245,6 +3245,7 @@
thanos::sidecar::port_grpc: "%{lookup('thanos::port::grpc')}"
thanos::query::port_http: "%{lookup('thanos::port::http')}"
thanos::query::config_filepath: "%{lookup('thanos::base::config_dir')}/query-sd.yaml"
+
thanos::gateway::port_http: 19192
thanos::gateway::port_grpc: 19093
diff --git a/site-modules/profile/manifests/thanos/base.pp b/site-modules/profile/manifests/thanos/base.pp
--- a/site-modules/profile/manifests/thanos/base.pp
+++ b/site-modules/profile/manifests/thanos/base.pp
@@ -12,7 +12,6 @@
$install_dir = "${install_basepath}/${version}"
$archive_path = "${install_basepath}/${version}.tar.gz"
-
$current_symlink = "${install_basepath}/current"
$config_dir = lookup('thanos::base::config_dir')
diff --git a/site-modules/profile/manifests/thanos/gateway.pp b/site-modules/profile/manifests/thanos/gateway.pp
new file mode 100644
--- /dev/null
+++ b/site-modules/profile/manifests/thanos/gateway.pp
@@ -0,0 +1,53 @@
+# Thanos gateway services (historical metrics access)
+class profile::thanos::gateway {
+ include profile::thanos::base
+
+ $service_name = 'thanos-gateway'
+ $unit_name = "${service_name}.service"
+ $port_http = lookup('thanos::gateway::port_http')
+ $port_grpc = lookup('thanos::gateway::port_grpc')
+ $internal_ip = ip_for_network(lookup('internal_network'))
+ $grpc_address = "${internal_ip}:${port_grpc}"
+
+ $objstore_config = lookup('thanos::objstore::config')
+ $objstore_config_file = "${::profile::thanos::base::config_dir}/objstore.yml"
+ $config_filepath = $::profile::thanos::base::config_filepath
+
+ file {$objstore_config_file:
+ ensure => present,
+ owner => 'root',
+ group => 'prometheus',
+ mode => '0640',
+ content => inline_yaml($objstore_config),
+ require => File[$::profile::thanos::base::config_dir],
+ }
+
+ $gateway_arguments = {
+ 'data-dir' => '/var/lib/prometheus/metrics2',
+ objstore => {
+ 'config-file' => $objstore_config_file,
+ },
+ 'http-address' => "${internal_ip}:${port_http}",
+ 'grpc-address' => $grpc_address,
+ }
+
+ # Template uses:
+ # $gateway_arguments
+ systemd::unit_file {$unit_name:
+ ensure => present,
+ content => template('profile/thanos/gateway.service.erb'),
+ require => Class['profile::thanos::base'],
+ notify => Service[$service_name]
+ }
+
+ service {$service_name:
+ ensure => 'running',
+ enable => true,
+ }
+
+ # gateway service grpc address pushed to query service configuration file to access
+ # historical data
+ ::profile::thanos::export_query_endpoint {"thanos-gateway-${::fqdn}":
+ grpc_address => $grpc_address
+ }
+}
diff --git a/site-modules/profile/manifests/thanos/prometheus_sidecar.pp b/site-modules/profile/manifests/thanos/prometheus_sidecar.pp
--- a/site-modules/profile/manifests/thanos/prometheus_sidecar.pp
+++ b/site-modules/profile/manifests/thanos/prometheus_sidecar.pp
@@ -1,4 +1,4 @@
-# Thanos prometheus sidecar
+# Thanos prometheus sidecar service
class profile::thanos::prometheus_sidecar {
include profile::thanos::base
@@ -6,9 +6,7 @@
$unit_name = "${service_name}.service"
$objstore_config = lookup('thanos::objstore::config')
-
- $config_dir = '/etc/thanos'
- $objstore_config_file = "${config_dir}/objstore.yml"
+ $objstore_config_file = "${::profile::thanos::base::config_dir}/objstore.yml"
$port_http = lookup('thanos::sidecar::port_http')
$port_grpc = lookup('thanos::sidecar::port_grpc')
@@ -18,7 +16,7 @@
$sidecar_arguments = {
tsdb => {
- path => '/var/lib/prometheus/metrics2',
+ path => '/var/lib/prometheus/metrics2'
},
prometheus => {
# use the listen address for the prometheus server
@@ -34,20 +32,13 @@
'grpc-address' => $grpc_address,
}
- file {$config_dir:
- ensure => directory,
- owner => 'root',
- group => 'prometheus',
- mode => '0750',
- require => Package['prometheus'],
- }
-
file {$objstore_config_file:
ensure => present,
owner => 'root',
group => 'prometheus',
mode => '0640',
content => inline_yaml($objstore_config),
+ require => File[$::profile::thanos::base::config_dir],
}
# Template uses:
diff --git a/site-modules/profile/manifests/thanos/query.pp b/site-modules/profile/manifests/thanos/query.pp
--- a/site-modules/profile/manifests/thanos/query.pp
+++ b/site-modules/profile/manifests/thanos/query.pp
@@ -6,6 +6,7 @@
$unit_name = "${service_name}.service"
$port_http = lookup('thanos::query::port_http')
+
$non_puppet_managed_stores = lookup('thanos::query::non_puppet_managed::stores')
$internal_ip = ip_for_network(lookup('internal_network'))
@@ -29,10 +30,6 @@
}
}
- # Deal with collected resources
- Concat <<| tag == 'thanos' |>> ~> Service[$service_name]
- Concat::Fragment <<| tag == 'thanos' |>> ~> Service[$service_name]
-
$query_arguments = {
"http-address" => "${internal_ip}:${port_http}",
"store.sd-files" => $config_filepath,
@@ -53,4 +50,7 @@
}
Class['profile::thanos::base'] ~> Service[$service_name]
+ # Deal with collected resources
+ Concat <<| tag == 'thanos' |>> ~> Service[$service_name]
+ Concat::Fragment <<| tag == 'thanos' |>> ~> Service[$service_name]
}
diff --git a/site-modules/profile/templates/thanos/gateway.service.erb b/site-modules/profile/templates/thanos/gateway.service.erb
new file mode 100644
--- /dev/null
+++ b/site-modules/profile/templates/thanos/gateway.service.erb
@@ -0,0 +1,39 @@
+# File managed by puppet (class profile::thanos::gateway)
+# Manual changes will be overwritten
+
+[Unit]
+Description=Thanos gateway
+
+[Service]
+Restart=on-failure
+User=prometheus
+ExecStart=/opt/thanos/current/thanos store <%= scope.call_function('flatten_to_argument_list', [@gateway_arguments]).join(" \\\n ") %>
+ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=20s
+SendSIGKILL=no
+
+# systemd hardening-options
+AmbientCapabilities=
+CapabilityBoundingSet=
+DeviceAllow=/dev/null rw
+DevicePolicy=strict
+LimitMEMLOCK=0
+LimitNOFILE=8192
+LockPersonality=true
+MemoryDenyWriteExecute=true
+NoNewPrivileges=true
+PrivateDevices=true
+PrivateTmp=true
+PrivateUsers=true
+ProtectControlGroups=true
+ProtectHome=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectSystem=full
+RemoveIPC=true
+RestrictNamespaces=true
+RestrictRealtime=true
+SystemCallArchitectures=native
+
+[Install]
+WantedBy=multi-user.target
diff --git a/site-modules/role/manifests/swh_thanos.pp b/site-modules/role/manifests/swh_thanos.pp
--- a/site-modules/role/manifests/swh_thanos.pp
+++ b/site-modules/role/manifests/swh_thanos.pp
@@ -1,4 +1,5 @@
# Thanos role
class role::swh_thanos inherits role::swh_server {
include profile::thanos::query
+ include profile::thanos::gateway
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Jan 30, 11:08 AM (1 w, 20 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3215724
Attached To
D8097: thanos: Configure gateway service to expose historical data
Event Timeline
Log In to Comment