Ema has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390428 )
Change subject: role::prometheus: add banner messages to MOTD ...................................................................... role::prometheus: add banner messages to MOTD Add banner messages to MOTD identifying prometheus server roles, eg: Prometheus server (ops). Change-Id: Ib71c76487eb1bc093a9cf79277ee6c6ab0509c3d --- M modules/role/manifests/prometheus/analytics.pp M modules/role/manifests/prometheus/global.pp M modules/role/manifests/prometheus/k8s.pp M modules/role/manifests/prometheus/ops.pp M modules/role/manifests/prometheus/services.pp 5 files changed, 20 insertions(+), 0 deletions(-) Approvals: Ema: Verified; Looks good to me, approved Filippo Giunchedi: Looks good to me, but someone else must approve diff --git a/modules/role/manifests/prometheus/analytics.pp b/modules/role/manifests/prometheus/analytics.pp index 0deeb99..404c5f0 100644 --- a/modules/role/manifests/prometheus/analytics.pp +++ b/modules/role/manifests/prometheus/analytics.pp @@ -3,6 +3,10 @@ # # filtertags: labs-project-monitoring class role::prometheus::analytics { + system::role { 'prometheus::analytics': + description => 'Prometheus server (analytics)', + } + include ::standard include ::base::firewall diff --git a/modules/role/manifests/prometheus/global.pp b/modules/role/manifests/prometheus/global.pp index e2d9fcd..a1302c0 100644 --- a/modules/role/manifests/prometheus/global.pp +++ b/modules/role/manifests/prometheus/global.pp @@ -1,4 +1,8 @@ class role::prometheus::global { + system::role { 'prometheus::global': + description => 'Prometheus server (global)', + } + include ::base::firewall # Pull selected metrics from all DC-local Prometheus servers. diff --git a/modules/role/manifests/prometheus/k8s.pp b/modules/role/manifests/prometheus/k8s.pp index cb1c7a5..3690aec 100644 --- a/modules/role/manifests/prometheus/k8s.pp +++ b/modules/role/manifests/prometheus/k8s.pp @@ -5,6 +5,10 @@ class role::prometheus::k8s ( $users = hiera('k8s_infrastructure_users'), # lint:ignore:wmf_styleguide ){ + system::role { 'prometheus::k8s': + description => 'Prometheus server (k8s)', + } + include ::standard include ::base::firewall diff --git a/modules/role/manifests/prometheus/ops.pp b/modules/role/manifests/prometheus/ops.pp index 1610242..c6a761d 100644 --- a/modules/role/manifests/prometheus/ops.pp +++ b/modules/role/manifests/prometheus/ops.pp @@ -3,6 +3,10 @@ # # filtertags: labs-project-monitoring class role::prometheus::ops { + system::role { 'prometheus::ops': + description => 'Prometheus server (ops)', + } + include ::standard include ::base::firewall diff --git a/modules/role/manifests/prometheus/services.pp b/modules/role/manifests/prometheus/services.pp index 80b7480..19c2b05 100644 --- a/modules/role/manifests/prometheus/services.pp +++ b/modules/role/manifests/prometheus/services.pp @@ -3,6 +3,10 @@ # # filtertags: labs-project-monitoring class role::prometheus::services { + system::role { 'prometheus::services': + description => 'Prometheus server (services)', + } + include ::standard include ::base::firewall -- To view, visit https://gerrit.wikimedia.org/r/390428 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib71c76487eb1bc093a9cf79277ee6c6ab0509c3d Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@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