Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/402388 )
Change subject: graphite: reorganize roles, one role() call per node ...................................................................... graphite: reorganize roles, one role() call per node Also, move role::statsd to a profile Change-Id: I4b4126d9a25a4b70275eac2e86c48b11a245d4e5 --- A hieradata/role/codfw/graphite/primary.yaml A hieradata/role/common/graphite/primary.yaml A hieradata/role/eqiad/graphite/primary.yaml M manifests/site.pp R modules/profile/manifests/statsd.pp A modules/role/manifests/graphite/primary.pp M modules/role/manifests/graphite/production.pp 7 files changed, 24 insertions(+), 7 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/codfw/graphite/primary.yaml b/hieradata/role/codfw/graphite/primary.yaml new file mode 100644 index 0000000..509c8bc --- /dev/null +++ b/hieradata/role/codfw/graphite/primary.yaml @@ -0,0 +1,3 @@ +graphite::web::cluster_servers: + - graphite2001.codfw.wmnet + - graphite2002.codfw.wmnet diff --git a/hieradata/role/common/graphite/primary.yaml b/hieradata/role/common/graphite/primary.yaml new file mode 100644 index 0000000..9acf843 --- /dev/null +++ b/hieradata/role/common/graphite/primary.yaml @@ -0,0 +1,3 @@ +admin::groups: + - perf-roots +graphite::web::uwsgi_processes: 16 diff --git a/hieradata/role/eqiad/graphite/primary.yaml b/hieradata/role/eqiad/graphite/primary.yaml new file mode 100644 index 0000000..5ce29cc --- /dev/null +++ b/hieradata/role/eqiad/graphite/primary.yaml @@ -0,0 +1,3 @@ +graphite::web::cluster_servers: + - graphite1001.eqiad.wmnet + - graphite1003.eqiad.wmnet diff --git a/manifests/site.pp b/manifests/site.pp index 1e71e7c..fd5863f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1011,8 +1011,12 @@ # Primary graphite machines node 'graphite1001.eqiad.wmnet' { - role(graphite::production, statsd, performance::site, graphite::alerts, - restbase::alerts, graphite::alerts::reqstats, elasticsearch::alerts) + role(graphite::primary) + # TODO: move the roles below to ::role::alerting::host + include ::role::graphite::alerts + include ::role::restbase::alerts + include ::role::graphite::alerts::reqstats + include ::role::elasticsearch::alerts } # graphite test machine, currently with SSD caching + spinning disks @@ -1022,17 +1026,17 @@ # graphite additional machine, for additional space node 'graphite1003.eqiad.wmnet' { - role(graphite::production, statsd) + role(graphite::production) } # Primary graphite machines node 'graphite2001.codfw.wmnet' { - role(graphite::production, statsd, performance::site) + role(graphite::primary) } # graphite additional machine, for additional space node 'graphite2002.codfw.wmnet' { - role(graphite::production, statsd) + role(graphite::production) } # replaced carbon and install1001/install2001 (T132757, T84380, T156440) diff --git a/modules/role/manifests/statsd.pp b/modules/profile/manifests/statsd.pp similarity index 98% rename from modules/role/manifests/statsd.pp rename to modules/profile/manifests/statsd.pp index e5e576f..8a01ca6 100644 --- a/modules/role/manifests/statsd.pp +++ b/modules/profile/manifests/statsd.pp @@ -5,7 +5,7 @@ # as well as the set of statsite backends that listen on these ports. # # filtertags: labs-project-graphite -class role::statsd { +class profile::statsd { class { '::statsd_proxy': server_port => 8125, diff --git a/modules/role/manifests/graphite/primary.pp b/modules/role/manifests/graphite/primary.pp new file mode 100644 index 0000000..dbc9f47 --- /dev/null +++ b/modules/role/manifests/graphite/primary.pp @@ -0,0 +1,4 @@ +class role::graphite::primary { + include ::role::graphite::production + include ::role::performance::site +} diff --git a/modules/role/manifests/graphite/production.pp b/modules/role/manifests/graphite/production.pp index b0b33b0..e46cac1 100644 --- a/modules/role/manifests/graphite/production.pp +++ b/modules/role/manifests/graphite/production.pp @@ -9,6 +9,7 @@ include ::standard include ::base::firewall + include ::profile::statsd # all graphite hosts also include statsd class { 'role::graphite::base': storage_dir => $storage_dir, @@ -117,4 +118,3 @@ srange => '$PRODUCTION_NETWORKS', } } - -- To view, visit https://gerrit.wikimedia.org/r/402388 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b4126d9a25a4b70275eac2e86c48b11a245d4e5 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits