Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187087
Change subject: move all files/icinga to modules/icinga/files
......................................................................
move all files/icinga to modules/icinga/files
Change-Id: I12a948004195c8b96f6ae083495d796bfdeac93f
---
M manifests/misc/monitoring.pp
M manifests/misc/udp2log.pp
M manifests/role/mail.pp
M modules/haproxy/manifests/init.pp
R modules/icinga/files/check-ori-weekend-commits
R modules/icinga/files/check_haproxy
R modules/icinga/files/check_job_queue
R modules/icinga/files/check_mailman_queue
R modules/icinga/files/check_mariadb.pl
R modules/icinga/files/check_subdir_limit
R modules/icinga/files/check_udp2log_log_age
R modules/icinga/files/check_udp2log_procs
12 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/187087/1
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index d243ed6..41c73f4 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -616,7 +616,7 @@
class misc::monitoring::ori_weekend_commits {
file { '/usr/local/lib/nagios/plugins/check-ori-weekend-commits':
- source => 'puppet:///files/icinga/check-ori-weekend-commits',
+ source => 'puppet:///modules/icinga/check-ori-weekend-commits',
owner => 'root',
group => 'root',
mode => '0555',
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index b210470..3aa337f 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -327,7 +327,7 @@
mode => '0555',
owner => 'root',
group => 'root',
- source => 'puppet:///files/icinga/check_udp2log_log_age',
+ source => 'puppet:///modules/icinga/check_udp2log_log_age',
}
file { 'check_udp2log_procs':
@@ -335,7 +335,7 @@
mode => '0555',
owner => 'root',
group => 'root',
- source => 'puppet:///files/icinga/check_udp2log_procs',
+ source => 'puppet:///modules/icinga/check_udp2log_procs',
}
file { 'rolematcher.py':
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 958fdc9..45a747c 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -177,7 +177,7 @@
owner => 'root',
group => 'root',
mode => '0755',
- source => 'puppet:///files/icinga/check_mailman_queue',
+ source => 'puppet:///modules/icinga/check_mailman_queue',
}
nrpe::monitor_service { 'mailman_queue':
diff --git a/modules/haproxy/manifests/init.pp
b/modules/haproxy/manifests/init.pp
index 1f08d44..b7037b9 100644
--- a/modules/haproxy/manifests/init.pp
+++ b/modules/haproxy/manifests/init.pp
@@ -38,7 +38,7 @@
owner => 'root',
group => 'root',
mode => '0755',
- source => 'puppet:///files/icinga/check_haproxy',
+ source => 'puppet:///modules/icinga/check_haproxy',
}
nrpe::monitor_service { 'haproxy':
diff --git a/files/icinga/check-ori-weekend-commits
b/modules/icinga/files/check-ori-weekend-commits
similarity index 100%
rename from files/icinga/check-ori-weekend-commits
rename to modules/icinga/files/check-ori-weekend-commits
diff --git a/files/icinga/check_haproxy b/modules/icinga/files/check_haproxy
similarity index 100%
rename from files/icinga/check_haproxy
rename to modules/icinga/files/check_haproxy
diff --git a/files/icinga/check_job_queue b/modules/icinga/files/check_job_queue
similarity index 100%
rename from files/icinga/check_job_queue
rename to modules/icinga/files/check_job_queue
diff --git a/files/icinga/check_mailman_queue
b/modules/icinga/files/check_mailman_queue
similarity index 100%
rename from files/icinga/check_mailman_queue
rename to modules/icinga/files/check_mailman_queue
diff --git a/files/icinga/check_mariadb.pl
b/modules/icinga/files/check_mariadb.pl
similarity index 100%
rename from files/icinga/check_mariadb.pl
rename to modules/icinga/files/check_mariadb.pl
diff --git a/files/icinga/check_subdir_limit
b/modules/icinga/files/check_subdir_limit
similarity index 100%
rename from files/icinga/check_subdir_limit
rename to modules/icinga/files/check_subdir_limit
diff --git a/files/icinga/check_udp2log_log_age
b/modules/icinga/files/check_udp2log_log_age
similarity index 100%
rename from files/icinga/check_udp2log_log_age
rename to modules/icinga/files/check_udp2log_log_age
diff --git a/files/icinga/check_udp2log_procs
b/modules/icinga/files/check_udp2log_procs
similarity index 100%
rename from files/icinga/check_udp2log_procs
rename to modules/icinga/files/check_udp2log_procs
--
To view, visit https://gerrit.wikimedia.org/r/187087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12a948004195c8b96f6ae083495d796bfdeac93f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
