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 0000000..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 0000000..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 0000000..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 0000000..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 0000000..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 0000000..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 +++ b/hieradata/role/common/graphite/production.yaml @@ -1,4 +1,4 @@ admin::groups: - perf-roots - +standard::has_ganglia: false graphite::web::uwsgi_processes: 16 diff --git a/hieradata/role/common/icinga.yaml b/hieradata/role/common/icinga.yaml new file mode 100644 index 0000000..49549d1 --- /dev/null +++ b/hieradata/role/common/icinga.yaml @@ -0,0 +1 @@ +standard::has_ganglia: false diff --git a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml index 7d7a879..4e99e3c 100644 --- a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml +++ b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml @@ -1,2 +1,3 @@ +standard::has_ganglia: false role::logging::kafkatee::webrequest::ops::logstash_host: logstash.svc.eqiad.wmnet role::logging::kafkatee::webrequest::ops::logstash_port: 11514 diff --git a/hieradata/role/common/microsites/peopleweb.yaml b/hieradata/role/common/microsites/peopleweb.yaml new file mode 100644 index 0000000..49549d1 --- /dev/null +++ b/hieradata/role/common/microsites/peopleweb.yaml @@ -0,0 +1 @@ +standard::has_ganglia: false diff --git a/hieradata/role/common/ores/redis.yaml b/hieradata/role/common/ores/redis.yaml index e6a9f33..9848ac6 100644 --- a/hieradata/role/common/ores/redis.yaml +++ b/hieradata/role/common/ores/redis.yaml @@ -1,3 +1,4 @@ +standard::has_ganglia: false ores::redis::queue_maxmemory: 1G ores::redis::cache_maxmemory: 6G #profile::ores::redis::password: actually in the private repo diff --git a/hieradata/role/common/puppetmaster/puppetdb.yaml b/hieradata/role/common/puppetmaster/puppetdb.yaml new file mode 100644 index 0000000..49549d1 --- /dev/null +++ b/hieradata/role/common/puppetmaster/puppetdb.yaml @@ -0,0 +1 @@ +standard::has_ganglia: false diff --git a/hieradata/role/common/rancid.yaml b/hieradata/role/common/rancid.yaml new file mode 100644 index 0000000..49549d1 --- /dev/null +++ b/hieradata/role/common/rancid.yaml @@ -0,0 +1 @@ +standard::has_ganglia: false diff --git a/hieradata/role/common/striker/web.yaml b/hieradata/role/common/striker/web.yaml index c1b7ca2..8382555 100644 --- a/hieradata/role/common/striker/web.yaml +++ b/hieradata/role/common/striker/web.yaml @@ -4,7 +4,7 @@ admin::groups: - wmcs-roots - +standard::has_ganglia: false striker::apache::server_name: toolsadmin.wikimedia.org striker::apache::docroot: /srv/deployment/striker/deploy/public_html striker::apache::servers: diff --git a/hieradata/role/common/syslog/centralserver.yaml b/hieradata/role/common/syslog/centralserver.yaml index ae1a4c6..e0ce4f6 100644 --- a/hieradata/role/common/syslog/centralserver.yaml +++ b/hieradata/role/common/syslog/centralserver.yaml @@ -1,3 +1,4 @@ +standard::has_ganglia: false mtail::logs: - /srv/syslog/syslog.log - /srv/syslog/apache2.log -- To view, visit https://gerrit.wikimedia.org/r/395873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44cf70be0027b1ad31d3a103355db1c5381f5038 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Volans <rcocci...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
