Mark Bergsma has submitted this change and it was merged.
Change subject: Rename new module temporarily to resolve conflicts
......................................................................
Rename new module temporarily to resolve conflicts
Change-Id: I793465ff41746f5d520160977bf205eddb06e2a8
---
R modules/ganglia-new/files/upstart/ganglia-monitor-aggregator-instance.conf
R modules/ganglia-new/files/upstart/ganglia-monitor-aggregator.conf
R modules/ganglia-new/files/upstart/ganglia-monitor.conf
R modules/ganglia-new/manifests/configuration.pp
R modules/ganglia-new/manifests/monitor/aggregator/init.pp
A modules/ganglia-new/manifests/monitor/aggregator/instance.pp
A modules/ganglia-new/manifests/monitor/config.pp
A modules/ganglia-new/manifests/monitor/init.pp
R modules/ganglia-new/manifests/monitor/packages.pp
R modules/ganglia-new/manifests/monitor/service.pp
R modules/ganglia-new/templates/gmond.conf.erb
D modules/ganglia/manifests/monitor/aggregator/instance.pp
D modules/ganglia/manifests/monitor/config.pp
D modules/ganglia/manifests/monitor/init.pp
14 files changed, 55 insertions(+), 55 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ganglia/files/upstart/ganglia-monitor-aggregator-instance.conf
b/modules/ganglia-new/files/upstart/ganglia-monitor-aggregator-instance.conf
similarity index 100%
rename from
modules/ganglia/files/upstart/ganglia-monitor-aggregator-instance.conf
rename to
modules/ganglia-new/files/upstart/ganglia-monitor-aggregator-instance.conf
diff --git a/modules/ganglia/files/upstart/ganglia-monitor-aggregator.conf
b/modules/ganglia-new/files/upstart/ganglia-monitor-aggregator.conf
similarity index 100%
rename from modules/ganglia/files/upstart/ganglia-monitor-aggregator.conf
rename to modules/ganglia-new/files/upstart/ganglia-monitor-aggregator.conf
diff --git a/modules/ganglia/files/upstart/ganglia-monitor.conf
b/modules/ganglia-new/files/upstart/ganglia-monitor.conf
similarity index 100%
rename from modules/ganglia/files/upstart/ganglia-monitor.conf
rename to modules/ganglia-new/files/upstart/ganglia-monitor.conf
diff --git a/modules/ganglia/manifests/configuration.pp
b/modules/ganglia-new/manifests/configuration.pp
similarity index 98%
rename from modules/ganglia/manifests/configuration.pp
rename to modules/ganglia-new/manifests/configuration.pp
index 448918e..a79c976 100644
--- a/modules/ganglia/manifests/configuration.pp
+++ b/modules/ganglia-new/manifests/configuration.pp
@@ -1,6 +1,6 @@
# modules/ganglia/manifests/configuration.pp
-class ganglia::configuration {
+class ganglia-new::configuration {
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
# and a different IP prefix will be used.
diff --git a/modules/ganglia/manifests/monitor/aggregator/init.pp
b/modules/ganglia-new/manifests/monitor/aggregator/init.pp
similarity index 85%
rename from modules/ganglia/manifests/monitor/aggregator/init.pp
rename to modules/ganglia-new/manifests/monitor/aggregator/init.pp
index 3231fb0..80540a3 100644
--- a/modules/ganglia/manifests/monitor/aggregator/init.pp
+++ b/modules/ganglia-new/manifests/monitor/aggregator/init.pp
@@ -1,5 +1,5 @@
-class ganglia::monitor::aggregator {
- require ganglia::monitor::packages
+class ganglia-new::monitor::aggregator {
+ require ganglia-new::monitor::packages
system_role { "ganglia::monitor::aggregator": description => "central
Ganglia aggregator" }
@@ -20,7 +20,7 @@
upstart_job { "ganglia-monitor-aggregator-instance": }
# Instantiate aggregators for all clusters
- $cluster_list = keys($ganglia::configuration::clusters)
+ $cluster_list = keys($ganglia-new::configuration::clusters)
instance{ $cluster_list: }
service { "ganglia-monitor-aggregator":
diff --git a/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
b/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
new file mode 100644
index 0000000..4c861fb
--- /dev/null
+++ b/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
@@ -0,0 +1,22 @@
+define ganglia-new::monitor::aggregator::instance() {
+ Ganglia-new::Monitor::Aggregator::Instance[$title] ->
Service[ganglia-monitor-aggregator]
+
+ $aggregator = true
+
+ # TODO: support multiple $site
+ $cluster = $title
+ $id = $ganglia-new::configuration::clusters[$cluster]['id']
+ $portnr = $ganglia-new::configuration::base_port + $id
+ $gmond_port = $::realm ? {
+ production => $portnr,
+ labs => $::project_gid
+ }
+ $cname = "${cluster} ${::site}"
+
+ file { "/etc/ganglia/aggregators/${id}.conf":
+ require => File["/etc/ganglia/aggregators"],
+ mode => 0444,
+ content => template("ganglia/gmond.conf.erb"),
+ notify => Service[$title]
+ }
+}
diff --git a/modules/ganglia-new/manifests/monitor/config.pp
b/modules/ganglia-new/manifests/monitor/config.pp
new file mode 100644
index 0000000..4754afb
--- /dev/null
+++ b/modules/ganglia-new/manifests/monitor/config.pp
@@ -0,0 +1,18 @@
+class ganglia-new::monitor::config($cluster) {
+ require ganglia-new::monitor::packages
+
+ $aggregator = false
+ $id = $ganglia-new::configuration::clusters[$cluster]['id']
+ $portnr = $ganglia-new::configuration::base_port + $id
+ $gmond_port = $::realm ? {
+ production => $portnr,
+ labs => $::project_gid
+ }
+ $cname = "${cluster} ${::site}"
+
+ file { "/etc/ganglia/gmond.conf":
+ mode => 0444,
+ content => template("ganglia/gmond.conf.erb"),
+ notify => Service["ganglia-monitor"]
+ }
+}
diff --git a/modules/ganglia-new/manifests/monitor/init.pp
b/modules/ganglia-new/manifests/monitor/init.pp
new file mode 100644
index 0000000..8e883e1
--- /dev/null
+++ b/modules/ganglia-new/manifests/monitor/init.pp
@@ -0,0 +1,5 @@
+class ganglia-new::monitor($cluster) {
+ include packages, service
+
+ class { "ganglia-new::monitor::config": cluster => $cluster }
+}
\ No newline at end of file
diff --git a/modules/ganglia/manifests/monitor/packages.pp
b/modules/ganglia-new/manifests/monitor/packages.pp
similarity index 71%
rename from modules/ganglia/manifests/monitor/packages.pp
rename to modules/ganglia-new/manifests/monitor/packages.pp
index d66d6e3..d3278d7 100644
--- a/modules/ganglia/manifests/monitor/packages.pp
+++ b/modules/ganglia-new/manifests/monitor/packages.pp
@@ -1,4 +1,4 @@
-class ganglia::monitor::packages {
+class ganglia-new::monitor::packages {
if !defined(Package["ganglia-monitor"]) {
package { "ganglia-monitor": ensure => latest }
}
diff --git a/modules/ganglia/manifests/monitor/service.pp
b/modules/ganglia-new/manifests/monitor/service.pp
similarity index 71%
rename from modules/ganglia/manifests/monitor/service.pp
rename to modules/ganglia-new/manifests/monitor/service.pp
index 168dfe3..cf696f5 100644
--- a/modules/ganglia/manifests/monitor/service.pp
+++ b/modules/ganglia-new/manifests/monitor/service.pp
@@ -1,5 +1,5 @@
-class ganglia::monitor::service() {
- Class[ganglia::monitor::config] -> Class[ganglia::monitor::service]
+class ganglia-new::monitor::service() {
+ Class[ganglia-new::monitor::config] ->
Class[ganglia-new::monitor::service]
file { "/etc/init/ganglia-monitor.conf":
source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor.conf",
diff --git a/modules/ganglia/templates/gmond.conf.erb
b/modules/ganglia-new/templates/gmond.conf.erb
similarity index 96%
rename from modules/ganglia/templates/gmond.conf.erb
rename to modules/ganglia-new/templates/gmond.conf.erb
index 8612795..4d9e210 100644
--- a/modules/ganglia/templates/gmond.conf.erb
+++ b/modules/ganglia-new/templates/gmond.conf.erb
@@ -23,7 +23,7 @@
name = "<%= cname %>"
owner = "Wikimedia Foundation"
latlong = "unspecified"
- url = "<%= scope.lookupvar("ganglia::configuration::url") %>"
+ url = "<%= scope.lookupvar("ganglia-new::configuration::url") %>"
}
/* The host section describes attributes of the host, like the location */
@@ -32,7 +32,7 @@
}
<% if not aggregator -%>
-<% scope.lookupvar("ganglia::configuration::gmetad_hosts").each do |host| -%>
+<% scope.lookupvar("ganglia-new::configuration::gmetad_hosts").each do |host|
-%>
udp_send_channel {
host = <%= host %>
port = <%= gmond_port %>
@@ -62,7 +62,7 @@
port = <%= gmond_port %>
acl {
default = "deny"
-<% scope.lookupvar("ganglia::configuration::gmetad_hosts").each do |host|
+<% scope.lookupvar("ganglia-new::configuration::gmetad_hosts").each do |host|
-%>
access {
ip = <%= host %>
diff --git a/modules/ganglia/manifests/monitor/aggregator/instance.pp
b/modules/ganglia/manifests/monitor/aggregator/instance.pp
deleted file mode 100644
index 62e7830..0000000
--- a/modules/ganglia/manifests/monitor/aggregator/instance.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-define ganglia::monitor::aggregator::instance() {
- Ganglia::Monitor::Aggregator::Instance[$title] ->
Service[ganglia-monitor-aggregator]
-
- $aggregator = true
-
- # TODO: support multiple $site
- $cluster = $title
- $id = $ganglia::configuration::clusters[$cluster]['id']
- $portnr = $ganglia::configuration::base_port + $id
- $gmond_port = $::realm ? {
- production => $portnr,
- labs => $::project_gid
- }
- $cname = "${cluster} ${::site}"
-
- file { "/etc/ganglia/aggregators/${id}.conf":
- require => File["/etc/ganglia/aggregators"],
- mode => 0444,
- content => template("ganglia/gmond.conf.erb"),
- notify => Service[$title]
- }
-}
diff --git a/modules/ganglia/manifests/monitor/config.pp
b/modules/ganglia/manifests/monitor/config.pp
deleted file mode 100644
index 8011f87..0000000
--- a/modules/ganglia/manifests/monitor/config.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class ganglia::monitor::config($cluster) {
- require ganglia::monitor::packages
-
- $aggregator = false
- $id = $ganglia::configuration::clusters[$cluster]['id']
- $portnr = $ganglia::configuration::base_port + $id
- $gmond_port = $::realm ? {
- production => $portnr,
- labs => $::project_gid
- }
- $cname = "${cluster} ${::site}"
-
- file { "/etc/ganglia/gmond.conf":
- mode => 0444,
- content => template("ganglia/gmond.conf.erb"),
- notify => Service["ganglia-monitor"]
- }
-}
diff --git a/modules/ganglia/manifests/monitor/init.pp
b/modules/ganglia/manifests/monitor/init.pp
deleted file mode 100644
index c2f7ad6..0000000
--- a/modules/ganglia/manifests/monitor/init.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class ganglia::monitor($cluster) {
- include packages, service
-
- class { "ganglia::monitor::config": cluster => $cluster }
-}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/53588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I793465ff41746f5d520160977bf205eddb06e2a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
