Filippo Giunchedi has submitted this change and it was merged. Change subject: prometheus: switch 'ops' prometheus to varbit encoding ......................................................................
prometheus: switch 'ops' prometheus to varbit encoding See also: * https://prometheus.io/docs/operating/storage/#chunk-encoding * https://prometheus.io/blog/2016/05/08/when-to-use-varbit-chunks/ Change-Id: I734301d35093ca75bf9ca7b57b6cd68d6d11d3ec --- M modules/prometheus/manifests/server.pp M modules/prometheus/templates/initscripts/prometh...@.systemd.erb M modules/role/manifests/prometheus/ops.pp 3 files changed, 3 insertions(+), 1 deletion(-) Approvals: Filippo Giunchedi: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/prometheus/manifests/server.pp b/modules/prometheus/manifests/server.pp index 61fb13f..a144360 100644 --- a/modules/prometheus/manifests/server.pp +++ b/modules/prometheus/manifests/server.pp @@ -50,6 +50,7 @@ $scrape_interval = '60s', $base_path = "/srv/prometheus/${title}", $storage_retention = '4320h0m0s', + $storage_encoding = '1', $global_config_extra = {}, $scrape_configs_extra = [], $rule_files_extra = [], diff --git a/modules/prometheus/templates/initscripts/prometh...@.systemd.erb b/modules/prometheus/templates/initscripts/prometh...@.systemd.erb index 1a261eb..cc8e479 100644 --- a/modules/prometheus/templates/initscripts/prometh...@.systemd.erb +++ b/modules/prometheus/templates/initscripts/prometh...@.systemd.erb @@ -3,7 +3,7 @@ [Service] User=prometheus -ExecStart=/usr/bin/prometheus -storage.local.path <%= @metrics_path %> -web.listen-address <%= @listen_address %> -web.external-url <%= @external_url %> -storage.local.retention <%= @storage_retention %> -config.file <%= @base_path %>/prometheus.yml +ExecStart=/usr/bin/prometheus -storage.local.path <%= @metrics_path %> -web.listen-address <%= @listen_address %> -web.external-url <%= @external_url %> -storage.local.retention <%= @storage_retention %> -config.file <%= @base_path %>/prometheus.yml -storage.local.chunk-encoding-version <%= @storage_encoding %> Restart=on-failure RestartSec=2s TimeoutStopSec=10m diff --git a/modules/role/manifests/prometheus/ops.pp b/modules/role/manifests/prometheus/ops.pp index 26035cd..746d022 100644 --- a/modules/role/manifests/prometheus/ops.pp +++ b/modules/role/manifests/prometheus/ops.pp @@ -111,6 +111,7 @@ } prometheus::server { 'ops': + storage_encoding => '2', listen_address => '127.0.0.1:9900', scrape_configs_extra => array_concat($mysql_jobs, $varnish_jobs, $memcached_jobs), global_config_extra => $config_extra, -- To view, visit https://gerrit.wikimedia.org/r/321941 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I734301d35093ca75bf9ca7b57b6cd68d6d11d3ec Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
