Dzahn has submitted this change and it was merged.
Change subject: logstash: Move files from root to role module
......................................................................
logstash: Move files from root to role module
Move the file resources used by role::logstash* to the role module's
file location.
Change-Id: I69ed4b46bdc669ae9db3c5d3aad672c7b49cf9bb
---
R modules/role/files/logstash/apifeatureusage-template.json
R modules/role/files/logstash/elasticsearch-template.json
R modules/role/files/logstash/filter-add-normalized-message.conf
R modules/role/files/logstash/filter-apifeatureusage.conf
R modules/role/files/logstash/filter-de_dot.conf
R modules/role/files/logstash/filter-eventlogging.conf
R modules/role/files/logstash/filter-gelf.conf
R modules/role/files/logstash/filter-logback.conf
R modules/role/files/logstash/filter-mediawiki.conf
R modules/role/files/logstash/filter-normalize-log-levels.conf
R modules/role/files/logstash/filter-puppet.conf
R modules/role/files/logstash/filter-striker.conf
R modules/role/files/logstash/filter-strip-ansi-color.conf
R modules/role/files/logstash/filter-syslog.conf
R modules/role/files/logstash/filter-udp2log.conf
R modules/role/files/logstash/stashbot-bash-template.json
R modules/role/files/logstash/stashbot-sal-template.json
R modules/role/files/logstash/stashbot-template.json
M modules/role/manifests/logstash.pp
19 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Dzahn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/logstash/apifeatureusage-template.json
b/modules/role/files/logstash/apifeatureusage-template.json
similarity index 100%
rename from files/logstash/apifeatureusage-template.json
rename to modules/role/files/logstash/apifeatureusage-template.json
diff --git a/files/logstash/elasticsearch-template.json
b/modules/role/files/logstash/elasticsearch-template.json
similarity index 100%
rename from files/logstash/elasticsearch-template.json
rename to modules/role/files/logstash/elasticsearch-template.json
diff --git a/files/logstash/filter-add-normalized-message.conf
b/modules/role/files/logstash/filter-add-normalized-message.conf
similarity index 100%
rename from files/logstash/filter-add-normalized-message.conf
rename to modules/role/files/logstash/filter-add-normalized-message.conf
diff --git a/files/logstash/filter-apifeatureusage.conf
b/modules/role/files/logstash/filter-apifeatureusage.conf
similarity index 100%
rename from files/logstash/filter-apifeatureusage.conf
rename to modules/role/files/logstash/filter-apifeatureusage.conf
diff --git a/files/logstash/filter-de_dot.conf
b/modules/role/files/logstash/filter-de_dot.conf
similarity index 100%
rename from files/logstash/filter-de_dot.conf
rename to modules/role/files/logstash/filter-de_dot.conf
diff --git a/files/logstash/filter-eventlogging.conf
b/modules/role/files/logstash/filter-eventlogging.conf
similarity index 100%
rename from files/logstash/filter-eventlogging.conf
rename to modules/role/files/logstash/filter-eventlogging.conf
diff --git a/files/logstash/filter-gelf.conf
b/modules/role/files/logstash/filter-gelf.conf
similarity index 100%
rename from files/logstash/filter-gelf.conf
rename to modules/role/files/logstash/filter-gelf.conf
diff --git a/files/logstash/filter-logback.conf
b/modules/role/files/logstash/filter-logback.conf
similarity index 100%
rename from files/logstash/filter-logback.conf
rename to modules/role/files/logstash/filter-logback.conf
diff --git a/files/logstash/filter-mediawiki.conf
b/modules/role/files/logstash/filter-mediawiki.conf
similarity index 100%
rename from files/logstash/filter-mediawiki.conf
rename to modules/role/files/logstash/filter-mediawiki.conf
diff --git a/files/logstash/filter-normalize-log-levels.conf
b/modules/role/files/logstash/filter-normalize-log-levels.conf
similarity index 100%
rename from files/logstash/filter-normalize-log-levels.conf
rename to modules/role/files/logstash/filter-normalize-log-levels.conf
diff --git a/files/logstash/filter-puppet.conf
b/modules/role/files/logstash/filter-puppet.conf
similarity index 100%
rename from files/logstash/filter-puppet.conf
rename to modules/role/files/logstash/filter-puppet.conf
diff --git a/files/logstash/filter-striker.conf
b/modules/role/files/logstash/filter-striker.conf
similarity index 100%
rename from files/logstash/filter-striker.conf
rename to modules/role/files/logstash/filter-striker.conf
diff --git a/files/logstash/filter-strip-ansi-color.conf
b/modules/role/files/logstash/filter-strip-ansi-color.conf
similarity index 100%
rename from files/logstash/filter-strip-ansi-color.conf
rename to modules/role/files/logstash/filter-strip-ansi-color.conf
diff --git a/files/logstash/filter-syslog.conf
b/modules/role/files/logstash/filter-syslog.conf
similarity index 100%
rename from files/logstash/filter-syslog.conf
rename to modules/role/files/logstash/filter-syslog.conf
diff --git a/files/logstash/filter-udp2log.conf
b/modules/role/files/logstash/filter-udp2log.conf
similarity index 100%
rename from files/logstash/filter-udp2log.conf
rename to modules/role/files/logstash/filter-udp2log.conf
diff --git a/files/logstash/stashbot-bash-template.json
b/modules/role/files/logstash/stashbot-bash-template.json
similarity index 100%
rename from files/logstash/stashbot-bash-template.json
rename to modules/role/files/logstash/stashbot-bash-template.json
diff --git a/files/logstash/stashbot-sal-template.json
b/modules/role/files/logstash/stashbot-sal-template.json
similarity index 100%
rename from files/logstash/stashbot-sal-template.json
rename to modules/role/files/logstash/stashbot-sal-template.json
diff --git a/files/logstash/stashbot-template.json
b/modules/role/files/logstash/stashbot-template.json
similarity index 100%
rename from files/logstash/stashbot-template.json
rename to modules/role/files/logstash/stashbot-template.json
diff --git a/modules/role/manifests/logstash.pp
b/modules/role/manifests/logstash.pp
index a0ac536..745ac6a 100644
--- a/modules/role/manifests/logstash.pp
+++ b/modules/role/manifests/logstash.pp
@@ -92,58 +92,58 @@
# move files into module?
# lint:ignore:puppet_url_without_modules
logstash::conf { 'filter_strip_ansi_color':
- source => 'puppet:///files/logstash/filter-strip-ansi-color.conf',
+ source =>
'puppet:///modules/role/logstash/filter-strip-ansi-color.conf',
priority => 15,
}
## Input specific processing (20)
logstash::conf { 'filter_syslog':
- source => 'puppet:///files/logstash/filter-syslog.conf',
+ source => 'puppet:///modules/role/logstash/filter-syslog.conf',
priority => 20,
}
logstash::conf { 'filter_udp2log':
- source => 'puppet:///files/logstash/filter-udp2log.conf',
+ source => 'puppet:///modules/role/logstash/filter-udp2log.conf',
priority => 20,
}
logstash::conf { 'filter_gelf':
- source => 'puppet:///files/logstash/filter-gelf.conf',
+ source => 'puppet:///modules/role/logstash/filter-gelf.conf',
priority => 20,
}
logstash::conf { 'filter_logback':
- source => 'puppet:///files/logstash/filter-logback.conf',
+ source => 'puppet:///modules/role/logstash/filter-logback.conf',
priority => 20,
}
## Application specific processing (50)
logstash::conf { 'filter_mediawiki':
- source => 'puppet:///files/logstash/filter-mediawiki.conf',
+ source => 'puppet:///modules/role/logstash/filter-mediawiki.conf',
priority => 50,
}
logstash::conf { 'filter_striker':
- source => 'puppet:///files/logstash/filter-striker.conf',
+ source => 'puppet:///modules/role/logstash/filter-striker.conf',
priority => 50,
}
## Global post-processing (70)
logstash::conf { 'filter_add_normalized_message':
- source =>
'puppet:///files/logstash/filter-add-normalized-message.conf',
+ source =>
'puppet:///modules/role/logstash/filter-add-normalized-message.conf',
priority => 70,
}
logstash::conf { 'filter_normalize_log_levels':
- source =>
'puppet:///files/logstash/filter-normalize-log-levels.conf',
+ source =>
'puppet:///modules/role/logstash/filter-normalize-log-levels.conf',
priority => 70,
}
logstash::conf { 'filter_de_dot':
- source => 'puppet:///files/logstash/filter-de_dot.conf',
+ source => 'puppet:///modules/role/logstash/filter-de_dot.conf',
priority => 70,
}
@@ -151,7 +151,7 @@
# Template for Elasticsearch index creation
file { '/etc/logstash/elasticsearch-template.json':
ensure => present,
- source => 'puppet:///files/logstash/elasticsearch-template.json',
+ source =>
'puppet:///modules/role/logstash/elasticsearch-template.json',
owner => 'root',
group => 'root',
mode => '0444',
@@ -258,7 +258,7 @@
# lint:ignore:puppet_url_without_modules
logstash::conf { 'filter_puppet':
- source => 'puppet:///files/logstash/filter-puppet.conf',
+ source => 'puppet:///modules/role/logstash/filter-puppet.conf',
priority => 50,
}
# lint:endignore
@@ -283,7 +283,7 @@
# lint:ignore:puppet_url_without_modules
file { '/etc/logstash/apifeatureusage-template.json':
ensure => present,
- source => 'puppet:///files/logstash/apifeatureusage-template.json',
+ source =>
'puppet:///modules/role/logstash/apifeatureusage-template.json',
owner => 'root',
group => 'root',
mode => '0444',
@@ -292,7 +292,7 @@
# Add configuration to logstash
# Needs to come after 'filter_mediawiki' (priority 50)
logstash::conf { 'filter_apifeatureusage':
- source => 'puppet:///files/logstash/filter-apifeatureusage.conf',
+ source =>
'puppet:///modules/role/logstash/filter-apifeatureusage.conf',
priority => 55,
}
# lint:endignore
@@ -325,7 +325,7 @@
}
# lint:ignore:puppet_url_without_modules
logstash::conf { 'filter_eventlogging':
- source => 'puppet:///files/logstash/filter-eventlogging.conf',
+ source => 'puppet:///modules/role/logstash/filter-eventlogging.conf',
priority => 50,
}
# lint:endignore
--
To view, visit https://gerrit.wikimedia.org/r/323332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69ed4b46bdc669ae9db3c5d3aad672c7b49cf9bb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
