Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/367375 )
Change subject: role::prometheus::memcached_exporter: move to profile
......................................................................
role::prometheus::memcached_exporter: move to profile
Change-Id: I74da1d7cf3e95e3324a780eb6543d7cff7385a20
---
M modules/profile/manifests/memcached/instance.pp
A modules/profile/manifests/prometheus/memcached_exporter.pp
D modules/role/manifests/prometheus/memcached_exporter.pp
3 files changed, 15 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/367375/1
diff --git a/modules/profile/manifests/memcached/instance.pp
b/modules/profile/manifests/memcached/instance.pp
index e0a0dc1..0a46bc1 100644
--- a/modules/profile/manifests/memcached/instance.pp
+++ b/modules/profile/manifests/memcached/instance.pp
@@ -20,18 +20,15 @@
# [*size*]
# Memcached max memory allocated size.
#
-# [*prometheus_nodes*]
-# Hosts allowed by the firewall to poll the memcached exporter
-# to retrieve memcached metrics.
-#
class profile::memcached::instance (
$growth_factor = hiera('profile::memcached::growth_factor'),
$extended_options = hiera_array('profile::memcached::extended_options'),
$version = hiera('profile::memcached::version'),
$port = hiera('profile::memcached::port'),
$size = hiera('profile::memcached::size'),
- $prometheus_nodes = hiera('prometheus_nodes')
) {
+ include ::profile::prometheus::memcached_exporter
+
class { '::memcached':
size => $size,
port => $port,
@@ -46,21 +43,5 @@
ferm::service { 'memcached':
proto => 'tcp',
port => $port,
- }
-
- $prometheus_port = '9150'
- prometheus::memcached_exporter { 'default': }
-
- if $::realm == 'labs' {
- $ferm_srange = '$LABS_NETWORKS'
- } else {
- $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
- $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
- }
-
- ferm::service { 'prometheus-memcached-exporter':
- proto => 'tcp',
- port => $prometheus_port,
- srange => $ferm_srange,
}
}
diff --git a/modules/profile/manifests/prometheus/memcached_exporter.pp
b/modules/profile/manifests/prometheus/memcached_exporter.pp
new file mode 100644
index 0000000..8d7bbd4
--- /dev/null
+++ b/modules/profile/manifests/prometheus/memcached_exporter.pp
@@ -0,0 +1,13 @@
+class profile::prometheus::memcached_exporter (
+ $prometheus_nodes = hiera('prometheus_nodes'),
+) {
+ prometheus::memcached_exporter { 'default': }
+ $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
+ $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
+
+ ferm::service { 'prometheus-memcached-exporter':
+ proto => 'tcp',
+ port => '9150',
+ srange => $ferm_srange,
+ }
+}
\ No newline at end of file
diff --git a/modules/role/manifests/prometheus/memcached_exporter.pp
b/modules/role/manifests/prometheus/memcached_exporter.pp
deleted file mode 100644
index 6829ebe..0000000
--- a/modules/role/manifests/prometheus/memcached_exporter.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class role::prometheus::memcached_exporter {
- prometheus::memcached_exporter { 'default': }
-
- if $::realm == 'labs' {
- $ferm_srange = '$LABS_NETWORKS'
- } else {
- $prometheus_nodes = hiera('prometheus_nodes')
- $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
- $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
- }
-
- ferm::service { 'prometheus-memcached-exporter':
- proto => 'tcp',
- port => '9150',
- srange => $ferm_srange,
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/367375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74da1d7cf3e95e3324a780eb6543d7cff7385a20
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
