[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: deploy prometheus-elasticsearch-exporter

2017-12-13 Thread Gehel (Code Review) 
Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398025 )

Change subject: elasticsearch: deploy prometheus-elasticsearch-exporter
..


elasticsearch: deploy prometheus-elasticsearch-exporter

This just creates the class to deploy the exporter, subsequent CR will
enable it for cirrus / logstash.

Bug: T181627
Change-Id: I70f934e129df31fffbefdb2ed152bac8fedbcffa
---
A modules/profile/manifests/elasticsearch/monitoring.pp
A modules/prometheus/manifests/elasticsearch_exporter.pp
2 files changed, 22 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Gehel: Looks good to me, approved



diff --git a/modules/profile/manifests/elasticsearch/monitoring.pp 
b/modules/profile/manifests/elasticsearch/monitoring.pp
new file mode 100644
index 000..e1bf3e0
--- /dev/null
+++ b/modules/profile/manifests/elasticsearch/monitoring.pp
@@ -0,0 +1,14 @@
+class profile::elasticsearch::monitoring(
+$prometheus_nodes = hiera('prometheus_nodes'),
+) {
+$prometheus_nodes_ferm = join($prometheus_nodes, ' ')
+
+class { '::prometheus::elasticsearch_exporter': }
+
+ferm::service { 'prometheus_elasticsearch_exporter':
+proto  => 'tcp',
+port   => '9108',
+srange => "@resolve((${prometheus_nodes_ferm}))",
+}
+
+}
diff --git a/modules/prometheus/manifests/elasticsearch_exporter.pp 
b/modules/prometheus/manifests/elasticsearch_exporter.pp
new file mode 100644
index 000..fff7625
--- /dev/null
+++ b/modules/prometheus/manifests/elasticsearch_exporter.pp
@@ -0,0 +1,8 @@
+class prometheus::elasticsearch_exporter {
+  ensure_packages('prometheus-elasticsearch-exporter')
+
+  service { 'prometheus-elasticsearch-exporter':
+ensure  => 'running',
+require => Package['prometheus-elasticsearch-exporter'],
+  }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/398025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I70f934e129df31fffbefdb2ed152bac8fedbcffa
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: deploy prometheus-elasticsearch-exporter

2017-12-13 Thread Gehel (Code Review) 
Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398025 )

Change subject: elasticsearch: deploy prometheus-elasticsearch-exporter
..

elasticsearch: deploy prometheus-elasticsearch-exporter

This just creates the class to deploy the exporter, subsequent CR will
enable it for cirrus / logstash.

Bug: T181627
Change-Id: I70f934e129df31fffbefdb2ed152bac8fedbcffa
---
A modules/elasticsearch/manifests/monitor/prometheus.pp
A modules/profile/manifests/elasticsearch/monitoring.pp
2 files changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/398025/1

diff --git a/modules/elasticsearch/manifests/monitor/prometheus.pp 
b/modules/elasticsearch/manifests/monitor/prometheus.pp
new file mode 100644
index 000..3709ffb
--- /dev/null
+++ b/modules/elasticsearch/manifests/monitor/prometheus.pp
@@ -0,0 +1,7 @@
+class elasticsearch::monitor::prometheus {
+ensure_packages('prometheus-elasticsearch-exporter')
+
+service { 'prometheus-elasticsearch-exporter':
+ensure => 'running',
+}
+}
diff --git a/modules/profile/manifests/elasticsearch/monitoring.pp 
b/modules/profile/manifests/elasticsearch/monitoring.pp
new file mode 100644
index 000..1f2beca
--- /dev/null
+++ b/modules/profile/manifests/elasticsearch/monitoring.pp
@@ -0,0 +1,14 @@
+class profile::elasticsearch::monitoring(
+$prometheus_nodes = hiera('prometheus_nodes'),
+) {
+$prometheus_nodes_ferm = join($prometheus_nodes, ' ')
+
+class { 'profile::elasticsearch::monitoring::prometheus': }
+
+ferm::service { 'prometheus_elasticsearch_exporter':
+proto  => 'tcp',
+port   => '9108',
+srange => "@resolve((${prometheus_nodes_ferm}))",
+}
+
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/398025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70f934e129df31fffbefdb2ed152bac8fedbcffa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits