[MediaWiki-commits] [Gerrit] operations/puppet[production]: various misc roles: remove ganglia

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

Change subject: various misc roles: remove ganglia
..


various misc roles: remove ganglia

Bug: T177225
Change-Id: I44cf70be0027b1ad31d3a103355db1c5381f5038
---
M hieradata/hosts/eventlog1001.yaml
A hieradata/role/common/analytics_cluster/hadoop/client.yaml
M hieradata/role/common/backup.yaml
A hieradata/role/common/bastionhost/twofa.yaml
M hieradata/role/common/ci/master.yaml
M hieradata/role/common/cluster/management.yaml
A hieradata/role/common/dmarc.yaml
M hieradata/role/common/docker/registry.yaml
A hieradata/role/common/dumps/public/server.yaml
A hieradata/role/common/dumps/web/xmldumps_fallback.yaml
A hieradata/role/common/failoid.yaml
M hieradata/role/common/graphite/production.yaml
A hieradata/role/common/icinga.yaml
M hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
A hieradata/role/common/microsites/peopleweb.yaml
M hieradata/role/common/ores/redis.yaml
A hieradata/role/common/puppetmaster/puppetdb.yaml
A hieradata/role/common/rancid.yaml
M hieradata/role/common/striker/web.yaml
M hieradata/role/common/syslog/centralserver.yaml
20 files changed, 21 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/hosts/eventlog1001.yaml 
b/hieradata/hosts/eventlog1001.yaml
index d6909c8..c1326fe 100644
--- a/hieradata/hosts/eventlog1001.yaml
+++ b/hieradata/hosts/eventlog1001.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - eventlogging-admins
-  - eventlogging-roots
\ No newline at end of file
+  - eventlogging-roots
+standard::has_ganglia: false
diff --git a/hieradata/role/common/analytics_cluster/hadoop/client.yaml 
b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/backup.yaml 
b/hieradata/role/common/backup.yaml
index 8a7ca26..1b4c54a 100644
--- a/hieradata/role/common/backup.yaml
+++ b/hieradata/role/common/backup.yaml
@@ -3,3 +3,4 @@
 profile::backup::director::offsite_sd: heze
 profile::backup::director::database: m1-master.eqiad.wmnet
 #profile::backup::director::dbpass: In the private repo
+standard::has_ganglia: false
diff --git a/hieradata/role/common/bastionhost/twofa.yaml 
b/hieradata/role/common/bastionhost/twofa.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/bastionhost/twofa.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/ci/master.yaml 
b/hieradata/role/common/ci/master.yaml
index d1173c1..4acdf78 100644
--- a/hieradata/role/common/ci/master.yaml
+++ b/hieradata/role/common/ci/master.yaml
@@ -3,6 +3,7 @@
   - contint-admins
   - contint-roots
 cluster: misc
+standard::has_ganglia: false
 contactgroups: 'admins,contint'
 
 profile::ci::jenkins::prefix: '/ci'
diff --git a/hieradata/role/common/cluster/management.yaml 
b/hieradata/role/common/cluster/management.yaml
index c9f0069..a0ea981 100644
--- a/hieradata/role/common/cluster/management.yaml
+++ b/hieradata/role/common/cluster/management.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - datacenter-ops
 monitor_screens: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dmarc.yaml b/hieradata/role/common/dmarc.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dmarc.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/docker/registry.yaml 
b/hieradata/role/common/docker/registry.yaml
index fe94f33..dcb2418 100644
--- a/hieradata/role/common/docker/registry.yaml
+++ b/hieradata/role/common/docker/registry.yaml
@@ -1,3 +1,4 @@
+standard::has_ganglia: false
 profile::docker::registry::image_builders:
   - '10.64.0.36' #boron.eqiad.wmnet
   - '208.80.154.17' # contint1001
diff --git a/hieradata/role/common/dumps/public/server.yaml 
b/hieradata/role/common/dumps/public/server.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/public/server.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/web/xmldumps_fallback.yaml 
b/hieradata/role/common/dumps/web/xmldumps_fallback.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/web/xmldumps_fallback.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/failoid.yaml 
b/hieradata/role/common/failoid.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/failoid.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/graphite/production.yaml 
b/hieradata/role/common/graphite/production.yaml
index 3238b42..63af869 100644
--- a/hieradata/role/common/graphite/production.yaml
+++

[MediaWiki-commits] [Gerrit] operations/puppet[production]: various misc roles: remove ganglia

2017-12-06 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395873 )

Change subject: various misc roles: remove ganglia
..

various misc roles: remove ganglia

Bug: T177225
Change-Id: I44cf70be0027b1ad31d3a103355db1c5381f5038
---
M hieradata/hosts/eventlog1001.yaml
A hieradata/role/common/analytics_cluster/hadoop/client.yaml
M hieradata/role/common/backup.yaml
A hieradata/role/common/bastionhost/twofa.yaml
M hieradata/role/common/ci/master.yaml
M hieradata/role/common/cluster/management.yaml
A hieradata/role/common/dmarc.yaml
M hieradata/role/common/docker/registry.yaml
A hieradata/role/common/dumps/public/server.yaml
A hieradata/role/common/dumps/web/xmldumps_fallback.yaml
A hieradata/role/common/failoid.yaml
M hieradata/role/common/graphite/production.yaml
A hieradata/role/common/icinga.yaml
M hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
A hieradata/role/common/microsites/peopleweb.yaml
M hieradata/role/common/ores/redis.yaml
A hieradata/role/common/puppetmaster/puppetdb.yaml
A hieradata/role/common/rancid.yaml
M hieradata/role/common/striker/web.yaml
M hieradata/role/common/syslog/centralserver.yaml
20 files changed, 21 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/395873/1

diff --git a/hieradata/hosts/eventlog1001.yaml 
b/hieradata/hosts/eventlog1001.yaml
index d6909c8..c1326fe 100644
--- a/hieradata/hosts/eventlog1001.yaml
+++ b/hieradata/hosts/eventlog1001.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - eventlogging-admins
-  - eventlogging-roots
\ No newline at end of file
+  - eventlogging-roots
+standard::has_ganglia: false
diff --git a/hieradata/role/common/analytics_cluster/hadoop/client.yaml 
b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/backup.yaml 
b/hieradata/role/common/backup.yaml
index 8a7ca26..1b4c54a 100644
--- a/hieradata/role/common/backup.yaml
+++ b/hieradata/role/common/backup.yaml
@@ -3,3 +3,4 @@
 profile::backup::director::offsite_sd: heze
 profile::backup::director::database: m1-master.eqiad.wmnet
 #profile::backup::director::dbpass: In the private repo
+standard::has_ganglia: false
diff --git a/hieradata/role/common/bastionhost/twofa.yaml 
b/hieradata/role/common/bastionhost/twofa.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/bastionhost/twofa.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/ci/master.yaml 
b/hieradata/role/common/ci/master.yaml
index d1173c1..4acdf78 100644
--- a/hieradata/role/common/ci/master.yaml
+++ b/hieradata/role/common/ci/master.yaml
@@ -3,6 +3,7 @@
   - contint-admins
   - contint-roots
 cluster: misc
+standard::has_ganglia: false
 contactgroups: 'admins,contint'
 
 profile::ci::jenkins::prefix: '/ci'
diff --git a/hieradata/role/common/cluster/management.yaml 
b/hieradata/role/common/cluster/management.yaml
index c9f0069..a0ea981 100644
--- a/hieradata/role/common/cluster/management.yaml
+++ b/hieradata/role/common/cluster/management.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - datacenter-ops
 monitor_screens: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dmarc.yaml b/hieradata/role/common/dmarc.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dmarc.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/docker/registry.yaml 
b/hieradata/role/common/docker/registry.yaml
index fe94f33..dcb2418 100644
--- a/hieradata/role/common/docker/registry.yaml
+++ b/hieradata/role/common/docker/registry.yaml
@@ -1,3 +1,4 @@
+standard::has_ganglia: false
 profile::docker::registry::image_builders:
   - '10.64.0.36' #boron.eqiad.wmnet
   - '208.80.154.17' # contint1001
diff --git a/hieradata/role/common/dumps/public/server.yaml 
b/hieradata/role/common/dumps/public/server.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/public/server.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/web/xmldumps_fallback.yaml 
b/hieradata/role/common/dumps/web/xmldumps_fallback.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/web/xmldumps_fallback.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/failoid.yaml 
b/hieradata/role/common/failoid.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/failoid.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/graphite/production.yaml 
b/hieradata/role/common/graphite/production.yaml
index 3238b42..63af869 100644
--- a/hieradata/role/common/graphite/production.yaml

[MediaWiki-commits] [Gerrit] operations/puppet[production]: various misc roles: remove ganglia

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

Change subject: various misc roles: remove ganglia
..


various misc roles: remove ganglia

Bug: T177225
Change-Id: I875e4dea1a2233049b37d9539a6ffeedce2ed0b0
---
M hieradata/role/common/builder.yaml
M hieradata/role/common/phabricator_server.yaml
M hieradata/role/common/planet_server.yaml
M hieradata/role/common/releases.yaml
M hieradata/role/common/requesttracker_server.yaml
M hieradata/role/common/webperf.yaml
M hieradata/role/common/webserver_misc_apps.yaml
M hieradata/role/common/webserver_misc_static.yaml
8 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/role/common/builder.yaml 
b/hieradata/role/common/builder.yaml
index 82fc96d..62d6a04 100644
--- a/hieradata/role/common/builder.yaml
+++ b/hieradata/role/common/builder.yaml
@@ -7,5 +7,6 @@
 profile::docker::builder::proxy_address: "webproxy.%{::site}.wmnet"
 profile::docker::builder::proxy_port: "8080"
 monitor_screens: false
+standard::has_ganglia: false
 # The default setup has no lvm, so no source
 #profile::docker::storage::loopback::dm_source: null
diff --git a/hieradata/role/common/phabricator_server.yaml 
b/hieradata/role/common/phabricator_server.yaml
index 8b8d5cc..eadbfa5 100644
--- a/hieradata/role/common/phabricator_server.yaml
+++ b/hieradata/role/common/phabricator_server.yaml
@@ -2,6 +2,7 @@
 admin::groups:
   - phabricator-admin
   - phabricator-roots
+standard::has_ganglia: false
 apache::logrotate::period: "daily"
 apache::logrotate::rotate: 3
 
diff --git a/hieradata/role/common/planet_server.yaml 
b/hieradata/role/common/planet_server.yaml
index a3b25fa..a5e57bb 100644
--- a/hieradata/role/common/planet_server.yaml
+++ b/hieradata/role/common/planet_server.yaml
@@ -1,3 +1,3 @@
 cluster: misc
-
 planet_domain_name: 'wikimedia.org'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/releases.yaml 
b/hieradata/role/common/releases.yaml
index 92ac574..0b07b0a 100644
--- a/hieradata/role/common/releases.yaml
+++ b/hieradata/role/common/releases.yaml
@@ -1,7 +1,7 @@
 admin::groups:
   - releasers-mediawiki
   - releasers-mobile
-
+standard::has_ganglia: false
 profile::releases::mediawiki::sitename: 'releases.wikimedia.org'
 profile::releases::mediawiki::sitename_jenkins: 
'releases-jenkins.wikimedia.org'
 profile::releases::mediawiki::server_admin: 'n...@wikimedia.org'
diff --git a/hieradata/role/common/requesttracker_server.yaml 
b/hieradata/role/common/requesttracker_server.yaml
index 7ad0377..8758e27 100644
--- a/hieradata/role/common/requesttracker_server.yaml
+++ b/hieradata/role/common/requesttracker_server.yaml
@@ -1 +1,2 @@
 standard::has_default_mail_relay: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webperf.yaml 
b/hieradata/role/common/webperf.yaml
index c637fcb..8c1c633 100644
--- a/hieradata/role/common/webperf.yaml
+++ b/hieradata/role/common/webperf.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - perf-team
   - eventlogging-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webserver_misc_apps.yaml 
b/hieradata/role/common/webserver_misc_apps.yaml
index 7ad0377..8758e27 100644
--- a/hieradata/role/common/webserver_misc_apps.yaml
+++ b/hieradata/role/common/webserver_misc_apps.yaml
@@ -1 +1,2 @@
 standard::has_default_mail_relay: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webserver_misc_static.yaml 
b/hieradata/role/common/webserver_misc_static.yaml
index ff1f796..1e33d9a4 100644
--- a/hieradata/role/common/webserver_misc_static.yaml
+++ b/hieradata/role/common/webserver_misc_static.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - releasers-mediawiki
   - releasers-mobile
+standard::has_ganglia: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I875e4dea1a2233049b37d9539a6ffeedce2ed0b0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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]: various misc roles: remove ganglia

2017-11-27 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393708 )

Change subject: various misc roles: remove ganglia
..

various misc roles: remove ganglia

Bug: T177225
Change-Id: I875e4dea1a2233049b37d9539a6ffeedce2ed0b0
---
M hieradata/role/common/builder.yaml
M hieradata/role/common/phabricator_server.yaml
M hieradata/role/common/planet_server.yaml
M hieradata/role/common/releases.yaml
M hieradata/role/common/requesttracker_server.yaml
M hieradata/role/common/webperf.yaml
M hieradata/role/common/webserver_misc_apps.yaml
M hieradata/role/common/webserver_misc_static.yaml
8 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/393708/1

diff --git a/hieradata/role/common/builder.yaml 
b/hieradata/role/common/builder.yaml
index 82fc96d..62d6a04 100644
--- a/hieradata/role/common/builder.yaml
+++ b/hieradata/role/common/builder.yaml
@@ -7,5 +7,6 @@
 profile::docker::builder::proxy_address: "webproxy.%{::site}.wmnet"
 profile::docker::builder::proxy_port: "8080"
 monitor_screens: false
+standard::has_ganglia: false
 # The default setup has no lvm, so no source
 #profile::docker::storage::loopback::dm_source: null
diff --git a/hieradata/role/common/phabricator_server.yaml 
b/hieradata/role/common/phabricator_server.yaml
index 8b8d5cc..eadbfa5 100644
--- a/hieradata/role/common/phabricator_server.yaml
+++ b/hieradata/role/common/phabricator_server.yaml
@@ -2,6 +2,7 @@
 admin::groups:
   - phabricator-admin
   - phabricator-roots
+standard::has_ganglia: false
 apache::logrotate::period: "daily"
 apache::logrotate::rotate: 3
 
diff --git a/hieradata/role/common/planet_server.yaml 
b/hieradata/role/common/planet_server.yaml
index a3b25fa..a5e57bb 100644
--- a/hieradata/role/common/planet_server.yaml
+++ b/hieradata/role/common/planet_server.yaml
@@ -1,3 +1,3 @@
 cluster: misc
-
 planet_domain_name: 'wikimedia.org'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/releases.yaml 
b/hieradata/role/common/releases.yaml
index 92ac574..0b07b0a 100644
--- a/hieradata/role/common/releases.yaml
+++ b/hieradata/role/common/releases.yaml
@@ -1,7 +1,7 @@
 admin::groups:
   - releasers-mediawiki
   - releasers-mobile
-
+standard::has_ganglia: false
 profile::releases::mediawiki::sitename: 'releases.wikimedia.org'
 profile::releases::mediawiki::sitename_jenkins: 
'releases-jenkins.wikimedia.org'
 profile::releases::mediawiki::server_admin: 'n...@wikimedia.org'
diff --git a/hieradata/role/common/requesttracker_server.yaml 
b/hieradata/role/common/requesttracker_server.yaml
index 7ad0377..8758e27 100644
--- a/hieradata/role/common/requesttracker_server.yaml
+++ b/hieradata/role/common/requesttracker_server.yaml
@@ -1 +1,2 @@
 standard::has_default_mail_relay: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webperf.yaml 
b/hieradata/role/common/webperf.yaml
index c637fcb..8c1c633 100644
--- a/hieradata/role/common/webperf.yaml
+++ b/hieradata/role/common/webperf.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - perf-team
   - eventlogging-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webserver_misc_apps.yaml 
b/hieradata/role/common/webserver_misc_apps.yaml
index 7ad0377..8758e27 100644
--- a/hieradata/role/common/webserver_misc_apps.yaml
+++ b/hieradata/role/common/webserver_misc_apps.yaml
@@ -1 +1,2 @@
 standard::has_default_mail_relay: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webserver_misc_static.yaml 
b/hieradata/role/common/webserver_misc_static.yaml
index ff1f796..1e33d9a4 100644
--- a/hieradata/role/common/webserver_misc_static.yaml
+++ b/hieradata/role/common/webserver_misc_static.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - releasers-mediawiki
   - releasers-mobile
+standard::has_ganglia: false

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

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

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