Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53595
Change subject: Rename new Ganglia module again
......................................................................
Rename new Ganglia module again
Change-Id: I2c745297c0a60be49ad3c1f0fe5134d09f83ac94
---
M manifests/site.pp
D modules/ganglia-new/manifests/init.pp
D modules/ganglia-new/manifests/monitor.pp
D modules/ganglia-new/manifests/monitor/aggregator/instance.pp
D modules/ganglia-new/manifests/monitor/config.pp
D modules/ganglia-new/manifests/monitor/service.pp
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
A modules/ganglia_new/manifests/init.pp
A modules/ganglia_new/manifests/monitor.pp
R modules/ganglia_new/manifests/monitor/aggregator.pp
A modules/ganglia_new/manifests/monitor/aggregator/instance.pp
A modules/ganglia_new/manifests/monitor/config.pp
R modules/ganglia_new/manifests/monitor/packages.pp
A modules/ganglia_new/manifests/monitor/service.pp
R modules/ganglia_new/templates/gmond.conf.erb
18 files changed, 75 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/53595/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 0b81bc6..2eac87d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -903,7 +903,7 @@
hosts => $storagehosts
}
- include ganglia-new::monitor::aggregator
+ include ganglia_new::monitor::aggregator
}
node "hooper.wikimedia.org" {
diff --git a/modules/ganglia-new/manifests/init.pp
b/modules/ganglia-new/manifests/init.pp
deleted file mode 100644
index 5849f0e..0000000
--- a/modules/ganglia-new/manifests/init.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class ganglia-new {
-
-}
\ No newline at end of file
diff --git a/modules/ganglia-new/manifests/monitor.pp
b/modules/ganglia-new/manifests/monitor.pp
deleted file mode 100644
index 8e883e1..0000000
--- a/modules/ganglia-new/manifests/monitor.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-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-new/manifests/monitor/aggregator/instance.pp
b/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
deleted file mode 100644
index 7509c7a..0000000
--- a/modules/ganglia-new/manifests/monitor/aggregator/instance.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-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-new/gmond.conf.erb"),
- notify => Service[$title]
- }
-}
diff --git a/modules/ganglia-new/manifests/monitor/config.pp
b/modules/ganglia-new/manifests/monitor/config.pp
deleted file mode 100644
index 4f45ba8..0000000
--- a/modules/ganglia-new/manifests/monitor/config.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-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-new/gmond.conf.erb"),
- notify => Service["ganglia-monitor"]
- }
-}
diff --git a/modules/ganglia-new/manifests/monitor/service.pp
b/modules/ganglia-new/manifests/monitor/service.pp
deleted file mode 100644
index 08ffe06..0000000
--- a/modules/ganglia-new/manifests/monitor/service.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-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-new/upstart/ganglia-monitor.conf",
- mode => 0444
- }
-
- upstart_job { "ganglia-monitor": }
-
- service { "ganglia-monitor":
- require => File["/etc/init/ganglia-monitor.conf"],
- ensure => running,
- provider => upstart
- }
-}
diff --git
a/modules/ganglia-new/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-new/files/upstart/ganglia-monitor-aggregator-instance.conf
rename to
modules/ganglia_new/files/upstart/ganglia-monitor-aggregator-instance.conf
diff --git a/modules/ganglia-new/files/upstart/ganglia-monitor-aggregator.conf
b/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
similarity index 100%
rename from modules/ganglia-new/files/upstart/ganglia-monitor-aggregator.conf
rename to modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
diff --git a/modules/ganglia-new/files/upstart/ganglia-monitor.conf
b/modules/ganglia_new/files/upstart/ganglia-monitor.conf
similarity index 100%
rename from modules/ganglia-new/files/upstart/ganglia-monitor.conf
rename to modules/ganglia_new/files/upstart/ganglia-monitor.conf
diff --git a/modules/ganglia-new/manifests/configuration.pp
b/modules/ganglia_new/manifests/configuration.pp
similarity index 98%
rename from modules/ganglia-new/manifests/configuration.pp
rename to modules/ganglia_new/manifests/configuration.pp
index a79c976..77b353a 100644
--- a/modules/ganglia-new/manifests/configuration.pp
+++ b/modules/ganglia_new/manifests/configuration.pp
@@ -1,6 +1,6 @@
# modules/ganglia/manifests/configuration.pp
-class ganglia-new::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_new/manifests/init.pp
b/modules/ganglia_new/manifests/init.pp
new file mode 100644
index 0000000..0ac7bce
--- /dev/null
+++ b/modules/ganglia_new/manifests/init.pp
@@ -0,0 +1,3 @@
+class ganglia_new {
+
+}
\ No newline at end of file
diff --git a/modules/ganglia_new/manifests/monitor.pp
b/modules/ganglia_new/manifests/monitor.pp
new file mode 100644
index 0000000..effa71e
--- /dev/null
+++ b/modules/ganglia_new/manifests/monitor.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-new/manifests/monitor/aggregator.pp
b/modules/ganglia_new/manifests/monitor/aggregator.pp
similarity index 69%
rename from modules/ganglia-new/manifests/monitor/aggregator.pp
rename to modules/ganglia_new/manifests/monitor/aggregator.pp
index 057847a..b18c9ce 100644
--- a/modules/ganglia-new/manifests/monitor/aggregator.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator.pp
@@ -1,5 +1,5 @@
-class ganglia-new::monitor::aggregator {
- require ganglia-new::monitor::packages
+class ganglia_new::monitor::aggregator {
+ require ganglia_new::monitor::packages
system_role { "ganglia::monitor::aggregator": description => "central
Ganglia aggregator" }
@@ -8,11 +8,11 @@
ensure => directory,
mode => 0555;
"/etc/init/ganglia-monitor-aggregator.conf":
- source =>
"puppet:///modules/ganglian-new/upstart/ganglia-monitor-aggregator.conf",
+ source =>
"puppet:///modules/$module_name/upstart/ganglia-monitor-aggregator.conf",
before => Service["ganglia-monitor-aggregator"],
mode => 0444;
"/etc/init/ganglia-monitor-aggregator-instance.conf":
- source =>
"puppet:///modules/ganglia-new/upstart/ganglia-monitor-aggregator-instance.conf",
+ source =>
"puppet:///modules/$module_name/upstart/ganglia-monitor-aggregator-instance.conf",
before => Service["ganglia-monitor-aggregator"],
mode => 0444;
}
@@ -20,7 +20,7 @@
upstart_job { "ganglia-monitor-aggregator-instance": }
# Instantiate aggregators for all clusters
- $cluster_list = keys(${ganglia-new::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..9ee5a7c
--- /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("$module_name/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..f6255cd
--- /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("$module_name/gmond.conf.erb"),
+ notify => Service["ganglia-monitor"]
+ }
+}
diff --git a/modules/ganglia-new/manifests/monitor/packages.pp
b/modules/ganglia_new/manifests/monitor/packages.pp
similarity index 71%
rename from modules/ganglia-new/manifests/monitor/packages.pp
rename to modules/ganglia_new/manifests/monitor/packages.pp
index d3278d7..fb24018 100644
--- a/modules/ganglia-new/manifests/monitor/packages.pp
+++ b/modules/ganglia_new/manifests/monitor/packages.pp
@@ -1,4 +1,4 @@
-class ganglia-new::monitor::packages {
+class ganglia_new::monitor::packages {
if !defined(Package["ganglia-monitor"]) {
package { "ganglia-monitor": ensure => latest }
}
diff --git a/modules/ganglia_new/manifests/monitor/service.pp
b/modules/ganglia_new/manifests/monitor/service.pp
new file mode 100644
index 0000000..df7f07a
--- /dev/null
+++ b/modules/ganglia_new/manifests/monitor/service.pp
@@ -0,0 +1,16 @@
+class ganglia_new::monitor::service() {
+ Class[ganglia_new::monitor::config] ->
Class[ganglia_new::monitor::service]
+
+ file { "/etc/init/ganglia-monitor.conf":
+ source =>
"puppet:///modules/$module_name/upstart/ganglia-monitor.conf",
+ mode => 0444
+ }
+
+ upstart_job { "ganglia-monitor": }
+
+ service { "ganglia-monitor":
+ require => File["/etc/init/ganglia-monitor.conf"],
+ ensure => running,
+ provider => upstart
+ }
+}
diff --git a/modules/ganglia-new/templates/gmond.conf.erb
b/modules/ganglia_new/templates/gmond.conf.erb
similarity index 97%
rename from modules/ganglia-new/templates/gmond.conf.erb
rename to modules/ganglia_new/templates/gmond.conf.erb
index 4d9e210..3c2048e 100644
--- a/modules/ganglia-new/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-new::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-new::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-new::configuration::gmetad_hosts").each do |host|
+<% scope.lookupvar("ganglia_new::configuration::gmetad_hosts").each do |host|
-%>
access {
ip = <%= host %>
--
To view, visit https://gerrit.wikimedia.org/r/53595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c745297c0a60be49ad3c1f0fe5134d09f83ac94
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
