[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove role::grafana::labs

2018-01-18 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404314 )

Change subject: Remove role::grafana::labs
..


Remove role::grafana::labs

Migrate to using the profile and specifying the correct hiera data,
removing the role in the process

Bug: T170150
Change-Id: I0df497afe3ff3fb25e705c91a77432ac43623a27
---
M hieradata/role/common/labs/monitoring.yaml
D modules/role/manifests/grafana/labs.pp
M modules/role/manifests/labs/monitoring.pp
3 files changed, 13 insertions(+), 25 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/labs/monitoring.yaml 
b/hieradata/role/common/labs/monitoring.yaml
index b3e0545..344af5e 100644
--- a/hieradata/role/common/labs/monitoring.yaml
+++ b/hieradata/role/common/labs/monitoring.yaml
@@ -5,3 +5,15 @@
   - esams.wmnet
   - ulsfo.wmnet
   - eqsin.wmnet
+profile::grafana::readonly_domain: grafana-labs.wikimedia.org
+profile::grafana::admin_domain: grafana-labs-admin.wikimedia.org
+profile::grafana::ldap_editor_description: LDAP Users (Wikitech)
+profile::grafana::ldap_edit_groups:
+  - cn=ops,ou=groups,dc=wikimedia,dc=org
+  - cn=nda,ou=groups,dc=wikimedia,dc=org
+  - cn=wmf,ou=groups,dc=wikimedia,dc=org
+  - cn=grafana-admin,ou=groups,dc=wikimedia,dc=org
+  - cn=project-bastion,ou=groups,dc=wikimedia,dc=org
+# In private repo
+#profile::grafana::secret_key:
+#profile::grafana::admin_password:
diff --git a/modules/role/manifests/grafana/labs.pp 
b/modules/role/manifests/grafana/labs.pp
deleted file mode 100644
index 0545eff..000
--- a/modules/role/manifests/grafana/labs.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-# == Class: role::grafana::labs
-#
-# Grafana is a dashboarding webapp for Graphite.
-# It powers .
-#
-class role::grafana::labs {
-include ::passwords::grafana::labs
-
-class { '::profile::grafana':
-readonly_domain => 'grafana-labs.wikimedia.org',
-admin_domain=> 'grafana-labs-admin.wikimedia.org',
-secret_key  => $passwords::grafana::labs::secret_key,
-admin_password  => $passwords::grafana::labs::admin_password,
-ldap_editor_description => 'LDAP Users (Wikitech)',
-ldap_editor_groups  => [
-'cn=ops,ou=groups,dc=wikimedia,dc=org',
-'cn=nda,ou=groups,dc=wikimedia,dc=org',
-'cn=wmf,ou=groups,dc=wikimedia,dc=org',
-'cn=grafana-admin,ou=groups,dc=wikimedia,dc=org',
-'cn=project-bastion,ou=groups,dc=wikimedia,dc=org'
-]
-}
-
-}
diff --git a/modules/role/manifests/labs/monitoring.pp 
b/modules/role/manifests/labs/monitoring.pp
index 30ef498..00e1344 100644
--- a/modules/role/manifests/labs/monitoring.pp
+++ b/modules/role/manifests/labs/monitoring.pp
@@ -2,7 +2,7 @@
 system::role { 'labs::monitoring': }
 include ::role::labs::graphite
 include ::role::labs::prometheus
-include ::role::grafana::labs
+include ::profile::grafana
 include standard
 include ::base::firewall
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0df497afe3ff3fb25e705c91a77432ac43623a27
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Giuseppe Lavagetto 
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]: Remove role::grafana::labs

2018-01-15 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404314 )

Change subject: Remove role::grafana::labs
..

Remove role::grafana::labs

Migrate to using the profile and specifying the correct hiera data,
removing the role in the process

Bug: T170150
Change-Id: I0df497afe3ff3fb25e705c91a77432ac43623a27
---
M hieradata/role/common/labs/monitoring.yaml
D modules/role/manifests/grafana/labs.pp
M modules/role/manifests/labs/monitoring.pp
3 files changed, 13 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/404314/1

diff --git a/hieradata/role/common/labs/monitoring.yaml 
b/hieradata/role/common/labs/monitoring.yaml
index b3e0545..0635f86 100644
--- a/hieradata/role/common/labs/monitoring.yaml
+++ b/hieradata/role/common/labs/monitoring.yaml
@@ -5,3 +5,15 @@
   - esams.wmnet
   - ulsfo.wmnet
   - eqsin.wmnet
+profile::grafana::readonly_domain: grafana-labs.wikimedia.org
+profile::grafana::admin_domain: grafana-labs-admin.wikimedia.org
+profile::grafana::ldap_editor_description: LDAP Users (Wikitech)
+profile::grafana::ldap_editor:
+  - cn=ops,ou=groups,dc=wikimedia,dc=org
+  - cn=nda,ou=groups,dc=wikimedia,dc=org
+  - cn=wmf,ou=groups,dc=wikimedia,dc=org
+  - cn=grafana-admin,ou=groups,dc=wikimedia,dc=org
+  - cn=project-bastion,ou=groups,dc=wikimedia,dc=org'
+# In private repo
+#profile::grafana::secret_key:
+#profile::grafana::admin_password:
diff --git a/modules/role/manifests/grafana/labs.pp 
b/modules/role/manifests/grafana/labs.pp
deleted file mode 100644
index 0545eff..000
--- a/modules/role/manifests/grafana/labs.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-# == Class: role::grafana::labs
-#
-# Grafana is a dashboarding webapp for Graphite.
-# It powers .
-#
-class role::grafana::labs {
-include ::passwords::grafana::labs
-
-class { '::profile::grafana':
-readonly_domain => 'grafana-labs.wikimedia.org',
-admin_domain=> 'grafana-labs-admin.wikimedia.org',
-secret_key  => $passwords::grafana::labs::secret_key,
-admin_password  => $passwords::grafana::labs::admin_password,
-ldap_editor_description => 'LDAP Users (Wikitech)',
-ldap_editor_groups  => [
-'cn=ops,ou=groups,dc=wikimedia,dc=org',
-'cn=nda,ou=groups,dc=wikimedia,dc=org',
-'cn=wmf,ou=groups,dc=wikimedia,dc=org',
-'cn=grafana-admin,ou=groups,dc=wikimedia,dc=org',
-'cn=project-bastion,ou=groups,dc=wikimedia,dc=org'
-]
-}
-
-}
diff --git a/modules/role/manifests/labs/monitoring.pp 
b/modules/role/manifests/labs/monitoring.pp
index 30ef498..00e1344 100644
--- a/modules/role/manifests/labs/monitoring.pp
+++ b/modules/role/manifests/labs/monitoring.pp
@@ -2,7 +2,7 @@
 system::role { 'labs::monitoring': }
 include ::role::labs::graphite
 include ::role::labs::prometheus
-include ::role::grafana::labs
+include ::profile::grafana
 include standard
 include ::base::firewall
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0df497afe3ff3fb25e705c91a77432ac43623a27
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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