Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405887 )
Change subject: wdqs: replace prometheus-wdqs-updater-exporter with
prometheus-jmx-exporter
......................................................................
wdqs: replace prometheus-wdqs-updater-exporter with prometheus-jmx-exporter
Bug: T182773
Change-Id: I8c5a5dfdeff332f90e29a19d21bb32bf67e0de26
---
A modules/profile/files/wdqs/wdqs-updater-prometheus-jmx.yaml
D modules/profile/manifests/prometheus/wdqs_updater_exporter.pp
M modules/profile/manifests/wdqs.pp
M modules/wdqs/manifests/updater.pp
M modules/wdqs/templates/updater-default.erb
5 files changed, 33 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/405887/1
diff --git a/modules/profile/files/wdqs/wdqs-updater-prometheus-jmx.yaml
b/modules/profile/files/wdqs/wdqs-updater-prometheus-jmx.yaml
new file mode 100644
index 0000000..19da75d
--- /dev/null
+++ b/modules/profile/files/wdqs/wdqs-updater-prometheus-jmx.yaml
@@ -0,0 +1,6 @@
+---
+lowercaseOutputLabelNames: true
+lowercaseOutputName: false
+startDelaySeconds: 10
+whitelistObjectNames:
+ - 'metrics:name=*'
diff --git a/modules/profile/manifests/prometheus/wdqs_updater_exporter.pp
b/modules/profile/manifests/prometheus/wdqs_updater_exporter.pp
deleted file mode 100644
index ed2d5ae..0000000
--- a/modules/profile/manifests/prometheus/wdqs_updater_exporter.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class profile::prometheus::wdqs_updater_exporter (
- $prometheus_nodes = hiera('prometheus_nodes'),
-) {
- $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
- $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
-
- require_package('prometheus-wdqs-updater-exporter')
-
- service { 'prometheus-wdqs-updater-exporter':
- ensure => running,
- }
-
- ferm::service { 'prometheus-wdqs-updater-exporter':
- proto => 'tcp',
- port => '9194',
- srange => $ferm_srange,
- }
-}
diff --git a/modules/profile/manifests/wdqs.pp
b/modules/profile/manifests/wdqs.pp
index b9af7e4..299d7a6 100644
--- a/modules/profile/manifests/wdqs.pp
+++ b/modules/profile/manifests/wdqs.pp
@@ -9,8 +9,8 @@
$blazegraph_config_file = hiera('profile::wdqs::blazegraph_config_file'),
$updater_options = hiera('profile::wdqs::updater_options'),
$nodes = hiera('profile::wdqs::nodes'),
+ $prometheus_nodes = hiera('prometheus_nodes'),
) {
- require ::profile::prometheus::wdqs_updater_exporter
require ::profile::prometheus::blazegraph_exporter
$nagios_contact_group = 'admins,wdqs-admins'
@@ -27,10 +27,30 @@
logstash_host => $logstash_host,
}
+ $prometheus_agent_path =
'/usr/share/java/prometheus/jmx_prometheus_javaagent.jar'
+ $prometheus_agent_port = '9101'
+ $prometheus_agent_config = '/etc/wdqs/wdqs-updater-prometheus-jmx.yaml'
+
+ # TODO: this is for cleanup of the previous wdqs-updater prometheus
exproter
+ # it will be removed in a future commit
+ package { 'prometheus-wdqs-updater-exporter':
+ ensure => absent,
+ }
+
# WDQS Updater service
+ profile::prometheus::jmx_exporter { 'wdqs-updater':
+ hostname => $::hostname,
+ port => $prometheus_agent_port,
+ prometheus_nodes => $prometheus_nodes,
+ config_file => $prometheus_agent_config,
+ content =>
'puppet:///modules/profile/wdqs/wdqs-updater-prometheus-jmx.yaml',
+ }
+
class { 'wdqs::updater':
- options => $updater_options,
- logstash_host => $logstash_host,
+ options => $updater_options,
+ logstash_host => $logstash_host,
+ extra_jvm_opts =>
"-javaagent:${prometheus_agent_path}=${prometheus_agent_port}:${prometheus_agent_config}",
+ require => Profile::Prometheus::Jmx_exporter['wdqs-updater'],
}
# Service Web proxy
diff --git a/modules/wdqs/manifests/updater.pp
b/modules/wdqs/manifests/updater.pp
index 1382db3..2d38fac 100644
--- a/modules/wdqs/manifests/updater.pp
+++ b/modules/wdqs/manifests/updater.pp
@@ -13,6 +13,7 @@
$package_dir = $::wdqs::package_dir,
$username = $::wdqs::username,
$data_dir = $::wdqs::data_dir,
+ $extra_jvm_opts = undef,
){
file { '/etc/default/wdqs-updater':
ensure => present,
diff --git a/modules/wdqs/templates/updater-default.erb
b/modules/wdqs/templates/updater-default.erb
index 76410c8..0f4752c 100644
--- a/modules/wdqs/templates/updater-default.erb
+++ b/modules/wdqs/templates/updater-default.erb
@@ -1 +1,4 @@
LOG_CONFIG=/etc/wdqs/logback-wdqs-updater.xml
+<%- if @extra_jvm_opts -%>
+EXTRA_JVM_OPTS=<%= @extra_jvm_opts %>
+<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/405887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c5a5dfdeff332f90e29a19d21bb32bf67e0de26
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
