[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "apache: remove ganglia monitoring""

2017-11-22 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392763 )

Change subject: Revert "Revert "apache: remove ganglia monitoring""
..


Revert "Revert "apache: remove ganglia monitoring""

This reverts commit 63686242937af81b9c67124998c032dfec5842ca.

Change-Id: I3001acbde8b318ffc75944af7a48381d52d6d64a
---
M hieradata/role/common/mediawiki/appserver.yaml
M hieradata/role/common/mediawiki/appserver/api.yaml
M hieradata/role/common/mediawiki/appserver/canary_api.yaml
M hieradata/role/common/mediawiki/canary_appserver.yaml
M hieradata/role/common/mediawiki/imagescaler.yaml
M hieradata/role/common/mediawiki/jobrunner.yaml
M hieradata/role/common/mediawiki/memcached.yaml
M hieradata/role/common/mediawiki/videoscaler.yaml
D modules/apache/files/apache_status.py
D modules/apache/files/apache_status.pyconf
M modules/apache/manifests/monitoring.pp
11 files changed, 8 insertions(+), 573 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/hieradata/role/common/mediawiki/appserver.yaml 
b/hieradata/role/common/mediawiki/appserver.yaml
index 28e1f2f..7d14664 100644
--- a/hieradata/role/common/mediawiki/appserver.yaml
+++ b/hieradata/role/common/mediawiki/appserver.yaml
@@ -18,3 +18,4 @@
 apache::logrotate::rotate: 12
 nutcracker::verbosity: "4"
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/appserver/api.yaml 
b/hieradata/role/common/mediawiki/appserver/api.yaml
index 1195204..7f01396 100644
--- a/hieradata/role/common/mediawiki/appserver/api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/api.yaml
@@ -18,3 +18,4 @@
 apache::logrotate::rotate: 12
 nutcracker::verbosity: "4"
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/appserver/canary_api.yaml 
b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
index 99cde6f..575a080 100644
--- a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
@@ -23,3 +23,4 @@
 apache::logrotate::rotate: 12
 nutcracker::verbosity: "4"
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml 
b/hieradata/role/common/mediawiki/canary_appserver.yaml
index a33df65..10e7a9e 100644
--- a/hieradata/role/common/mediawiki/canary_appserver.yaml
+++ b/hieradata/role/common/mediawiki/canary_appserver.yaml
@@ -23,3 +23,4 @@
 apache::logrotate::rotate: 12
 nutcracker::verbosity: "4"
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/imagescaler.yaml 
b/hieradata/role/common/mediawiki/imagescaler.yaml
index 201ab70..7a6a277 100644
--- a/hieradata/role/common/mediawiki/imagescaler.yaml
+++ b/hieradata/role/common/mediawiki/imagescaler.yaml
@@ -13,3 +13,4 @@
   light_process_count: "10"
 apache::mpm::mpm: worker
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml 
b/hieradata/role/common/mediawiki/jobrunner.yaml
index c638464..5f35732 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -21,3 +21,4 @@
 role::lvs::realserver::pools:
   hhvm:
 lvs_name: jobrunner
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/memcached.yaml 
b/hieradata/role/common/mediawiki/memcached.yaml
index 70221d7..c695d12 100644
--- a/hieradata/role/common/mediawiki/memcached.yaml
+++ b/hieradata/role/common/mediawiki/memcached.yaml
@@ -22,3 +22,4 @@
 profile::memcached::extended_options:
   - 'slab_reassign'
 profile::memcached::port: '11211'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/videoscaler.yaml 
b/hieradata/role/common/mediawiki/videoscaler.yaml
index 3a04f72..40eaeb1 100644
--- a/hieradata/role/common/mediawiki/videoscaler.yaml
+++ b/hieradata/role/common/mediawiki/videoscaler.yaml
@@ -13,3 +13,4 @@
   thread_count: 15
   max_execution_time: 86400
 profile::mediawiki::jobrunner::load_factor: 0.7
+standard::has_ganglia: false
diff --git a/modules/apache/files/apache_status.py 
b/modules/apache/files/apache_status.py
deleted file mode 100755
index 15c0f2b..000
--- a/modules/apache/files/apache_status.py
+++ /dev/null
@@ -1,439 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import time
-import urllib2
-import traceback
-import re
-import copy
-
-# global to store state for "total accesses"
-METRICS = {
-'time': 0,
-'data': {}
-}
-
-LAST_METRICS = copy.deepcopy(METRICS)
-METRICS_CACHE_MAX = 5
-
-# Metric prefix
-NAME_PREFIX = "ap_"
-SSL_NAME_PREFIX = "apssl_"
-
-SERVER_STATUS_URL = ""
-
-descriptors = list()
-Desc_Skel = {}
-Scoreboard = {
-NAME_PREFIX + 'waiting': {
-'key': '_',

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "apache: remove ganglia monitoring""

2017-11-21 Thread Dzahn (Code Review) 
Hello Giuseppe Lavagetto, jenkins-bot, Filippo Giunchedi, Volans,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/392763

to review the following change.


Change subject: Revert "Revert "apache: remove ganglia monitoring""
..

Revert "Revert "apache: remove ganglia monitoring""

This reverts commit 63686242937af81b9c67124998c032dfec5842ca.

Change-Id: I3001acbde8b318ffc75944af7a48381d52d6d64a
---
M hieradata/role/common/mediawiki/appserver.yaml
M hieradata/role/common/mediawiki/appserver/api.yaml
M hieradata/role/common/mediawiki/appserver/canary_api.yaml
M hieradata/role/common/mediawiki/canary_appserver.yaml
M hieradata/role/common/mediawiki/imagescaler.yaml
M hieradata/role/common/mediawiki/jobrunner.yaml
M hieradata/role/common/mediawiki/memcached.yaml
M hieradata/role/common/mediawiki/videoscaler.yaml
D modules/apache/files/apache_status.py
D modules/apache/files/apache_status.pyconf
M modules/apache/manifests/monitoring.pp
11 files changed, 8 insertions(+), 573 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/392763/1

diff --git a/hieradata/role/common/mediawiki/appserver.yaml 
b/hieradata/role/common/mediawiki/appserver.yaml
index 28e1f2f..7d14664 100644
--- a/hieradata/role/common/mediawiki/appserver.yaml
+++ b/hieradata/role/common/mediawiki/appserver.yaml
@@ -18,3 +18,4 @@
 apache::logrotate::rotate: 12
 nutcracker::verbosity: "4"
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/appserver/api.yaml 
b/hieradata/role/common/mediawiki/appserver/api.yaml
index 1195204..7f01396 100644
--- a/hieradata/role/common/mediawiki/appserver/api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/api.yaml
@@ -18,3 +18,4 @@
 apache::logrotate::rotate: 12
 nutcracker::verbosity: "4"
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/appserver/canary_api.yaml 
b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
index 99cde6f..575a080 100644
--- a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
@@ -23,3 +23,4 @@
 apache::logrotate::rotate: 12
 nutcracker::verbosity: "4"
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml 
b/hieradata/role/common/mediawiki/canary_appserver.yaml
index a33df65..10e7a9e 100644
--- a/hieradata/role/common/mediawiki/canary_appserver.yaml
+++ b/hieradata/role/common/mediawiki/canary_appserver.yaml
@@ -23,3 +23,4 @@
 apache::logrotate::rotate: 12
 nutcracker::verbosity: "4"
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/imagescaler.yaml 
b/hieradata/role/common/mediawiki/imagescaler.yaml
index 201ab70..7a6a277 100644
--- a/hieradata/role/common/mediawiki/imagescaler.yaml
+++ b/hieradata/role/common/mediawiki/imagescaler.yaml
@@ -13,3 +13,4 @@
   light_process_count: "10"
 apache::mpm::mpm: worker
 role::mediawiki::webserver::tls: true
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml 
b/hieradata/role/common/mediawiki/jobrunner.yaml
index aae358f..10b4bf2 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -20,3 +20,4 @@
 role::lvs::realserver::pools:
   hhvm:
 lvs_name: jobrunner
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/memcached.yaml 
b/hieradata/role/common/mediawiki/memcached.yaml
index 70221d7..c695d12 100644
--- a/hieradata/role/common/mediawiki/memcached.yaml
+++ b/hieradata/role/common/mediawiki/memcached.yaml
@@ -22,3 +22,4 @@
 profile::memcached::extended_options:
   - 'slab_reassign'
 profile::memcached::port: '11211'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki/videoscaler.yaml 
b/hieradata/role/common/mediawiki/videoscaler.yaml
index 5fbe653..253052e 100644
--- a/hieradata/role/common/mediawiki/videoscaler.yaml
+++ b/hieradata/role/common/mediawiki/videoscaler.yaml
@@ -12,3 +12,4 @@
   connection_timeout_seconds: 86400
   thread_count: 15
   max_execution_time: 86400
+standard::has_ganglia: false
diff --git a/modules/apache/files/apache_status.py 
b/modules/apache/files/apache_status.py
deleted file mode 100755
index 15c0f2b..000
--- a/modules/apache/files/apache_status.py
+++ /dev/null
@@ -1,439 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import time
-import urllib2
-import traceback
-import re
-import copy
-
-# global to store state for "total accesses"
-METRICS = {
-'time': 0,
-'data': {}
-}
-
-LAST_METRICS = copy.deepcopy(METRICS)
-METRICS_CACHE_MAX = 5
-
-# Metric prefix
-NAME_PREFIX = "ap_"
-SSL_NAME_PREFIX = "apssl_"
-
-SERVER_STATUS_URL = ""
-