Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249062
Change subject: logstash: move files from ./files to module
......................................................................
logstash: move files from ./files to module
Move all these files into the logstash module.
We would like to get rid of the global ./files/
just like ./misc/ and move everything into module
structure.
Also no reason to have some files here and others there.
And it fixes all these:
Change-Id: I631be974b4436cf998a91af3f48fa3723eea496d
WARNING: puppet:// URL without modules/ found on line 78
WARNING: puppet:// URL without modules/ found on line 85
WARNING: puppet:// URL without modules/ found on line 90
WARNING: puppet:// URL without modules/ found on line 95
WARNING: puppet:// URL without modules/ found on line 100
WARNING: puppet:// URL without modules/ found on line 107
WARNING: puppet:// URL without modules/ found on line 114
WARNING: puppet:// URL without modules/ found on line 119
WARNING: puppet:// URL without modules/ found on line 127
WARNING: puppet:// URL without modules/ found on line 206
WARNING: puppet:// URL without modules/ found on line 229
WARNING: puppet:// URL without modules/ found on line 238
WARNING: puppet:// URL without modules/ found on line 292
WARNING: puppet:// URL without modules/ found on line 299
WARNING: puppet:// URL without modules/ found on line 304
WARNING: puppet:// URL without modules/ found on line 309
WARNING: puppet:// URL without modules/ found on line 315
WARNING: puppet:// URL without modules/ found on line 332
WARNING: puppet:// URL without modules/ found on line 349
---
M manifests/role/logstash.pp
R modules/logstash/files/apifeatureusage-template.json
R modules/logstash/files/elasticsearch-template.json
R modules/logstash/files/filter-add-normalized-message.conf
R modules/logstash/files/filter-apifeatureusage.conf
R modules/logstash/files/filter-eventlogging.conf
R modules/logstash/files/filter-gelf.conf
R modules/logstash/files/filter-logback.conf
R modules/logstash/files/filter-mediawiki.conf
R modules/logstash/files/filter-normalize-log-levels.conf
R modules/logstash/files/filter-puppet.conf
R modules/logstash/files/filter-stashbot-bash.conf
R modules/logstash/files/filter-stashbot-sal.conf
R modules/logstash/files/filter-stashbot.conf
R modules/logstash/files/filter-strip-ansi-color.conf
R modules/logstash/files/filter-syslog.conf
R modules/logstash/files/filter-udp2log.conf
R modules/logstash/files/stashbot-bash-template.json
R modules/logstash/files/stashbot-sal-template.json
R modules/logstash/files/stashbot-template.json
20 files changed, 19 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/249062/1
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index e57b779..db490af 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -75,48 +75,48 @@
## Global pre-processing (15)
logstash::conf { 'filter_strip_ansi_color':
- source => 'puppet:///files/logstash/filter-strip-ansi-color.conf',
+ source => 'puppet:///modules/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/logstash/filter-syslog.conf',
priority => 20,
}
logstash::conf { 'filter_udp2log':
- source => 'puppet:///files/logstash/filter-udp2log.conf',
+ source => 'puppet:///modules/logstash/filter-udp2log.conf',
priority => 20,
}
logstash::conf { 'filter_gelf':
- source => 'puppet:///files/logstash/filter-gelf.conf',
+ source => 'puppet:///modules/logstash/filter-gelf.conf',
priority => 20,
}
logstash::conf { 'filter_logback':
- source => 'puppet:///files/logstash/filter-logback.conf',
+ source => 'puppet:///modules/logstash/filter-logback.conf',
priority => 20,
}
## Application specific processing (50)
logstash::conf { 'filter_mediawiki':
- source => 'puppet:///files/logstash/filter-mediawiki.conf',
+ source => 'puppet:///modules/logstash/filter-mediawiki.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/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/logstash/filter-normalize-log-levels.conf',
priority => 70,
}
@@ -124,7 +124,7 @@
# Template for Elasticsearch index creation
file { '/etc/logstash/elasticsearch-template.json':
ensure => present,
- source => 'puppet:///files/logstash/elasticsearch-template.json',
+ source => 'puppet:///modules/logstash/elasticsearch-template.json',
owner => 'root',
group => 'root',
mode => '0444',
@@ -203,7 +203,7 @@
}
logstash::conf { 'filter_puppet':
- source => 'puppet:///files/logstash/filter-puppet.conf',
+ source => 'puppet:///modules/logstash/filter-puppet.conf',
priority => 50,
}
}
@@ -226,7 +226,7 @@
# Template for Elasticsearch index creation
file { '/etc/logstash/apifeatureusage-template.json':
ensure => present,
- source => 'puppet:///files/logstash/apifeatureusage-template.json',
+ source => 'puppet:///modules/logstash/apifeatureusage-template.json',
owner => 'root',
group => 'root',
mode => '0444',
@@ -235,7 +235,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/logstash/filter-apifeatureusage.conf',
priority => 55,
}
@@ -289,30 +289,30 @@
}
logstash::conf { 'filter_strip_ansi_color':
- source => 'puppet:///files/logstash/filter-strip-ansi-color.conf',
+ source => 'puppet:///modules/logstash/filter-strip-ansi-color.conf',
priority => 15,
}
# ferm::service not needed as irc connection is made outbound
logstash::conf { 'filter_stashbot':
- source => 'puppet:///files/logstash/filter-stashbot.conf',
+ source => 'puppet:///modules/logstash/filter-stashbot.conf',
priority => 20,
}
logstash::conf { 'filter_stashbot_sal':
- source => 'puppet:///files/logstash/filter-stashbot-sal.conf',
+ source => 'puppet:///modules/logstash/filter-stashbot-sal.conf',
priority => 50,
}
logstash::conf { 'filter_stashbot_bash':
- source => 'puppet:///files/logstash/filter-stashbot-bash.conf',
+ source => 'puppet:///modules/logstash/filter-stashbot-bash.conf',
priority => 50,
}
file { '/etc/logstash/stashbot-template.json':
ensure => present,
- source => 'puppet:///files/logstash/stashbot-template.json',
+ source => 'puppet:///modules/logstash/stashbot-template.json',
owner => 'root',
group => 'root',
mode => '0444',
@@ -329,7 +329,7 @@
# Special indexing for SAL messages
file { '/etc/logstash/stashbot-sal-template.json':
ensure => present,
- source => 'puppet:///files/logstash/stashbot-sal-template.json',
+ source => 'puppet:///modules/logstash/stashbot-sal-template.json',
owner => 'root',
group => 'root',
mode => '0444',
@@ -346,7 +346,7 @@
# Special indexing for bash messages
file { '/etc/logstash/stashbot-bash-template.json':
ensure => present,
- source => 'puppet:///files/logstash/stashbot-bash-template.json',
+ source => 'puppet:///modules/logstash/stashbot-bash-template.json',
owner => 'root',
group => 'root',
mode => '0444',
diff --git a/files/logstash/apifeatureusage-template.json
b/modules/logstash/files/apifeatureusage-template.json
similarity index 100%
rename from files/logstash/apifeatureusage-template.json
rename to modules/logstash/files/apifeatureusage-template.json
diff --git a/files/logstash/elasticsearch-template.json
b/modules/logstash/files/elasticsearch-template.json
similarity index 100%
rename from files/logstash/elasticsearch-template.json
rename to modules/logstash/files/elasticsearch-template.json
diff --git a/files/logstash/filter-add-normalized-message.conf
b/modules/logstash/files/filter-add-normalized-message.conf
similarity index 100%
rename from files/logstash/filter-add-normalized-message.conf
rename to modules/logstash/files/filter-add-normalized-message.conf
diff --git a/files/logstash/filter-apifeatureusage.conf
b/modules/logstash/files/filter-apifeatureusage.conf
similarity index 100%
rename from files/logstash/filter-apifeatureusage.conf
rename to modules/logstash/files/filter-apifeatureusage.conf
diff --git a/files/logstash/filter-eventlogging.conf
b/modules/logstash/files/filter-eventlogging.conf
similarity index 100%
rename from files/logstash/filter-eventlogging.conf
rename to modules/logstash/files/filter-eventlogging.conf
diff --git a/files/logstash/filter-gelf.conf
b/modules/logstash/files/filter-gelf.conf
similarity index 100%
rename from files/logstash/filter-gelf.conf
rename to modules/logstash/files/filter-gelf.conf
diff --git a/files/logstash/filter-logback.conf
b/modules/logstash/files/filter-logback.conf
similarity index 100%
rename from files/logstash/filter-logback.conf
rename to modules/logstash/files/filter-logback.conf
diff --git a/files/logstash/filter-mediawiki.conf
b/modules/logstash/files/filter-mediawiki.conf
similarity index 100%
rename from files/logstash/filter-mediawiki.conf
rename to modules/logstash/files/filter-mediawiki.conf
diff --git a/files/logstash/filter-normalize-log-levels.conf
b/modules/logstash/files/filter-normalize-log-levels.conf
similarity index 100%
rename from files/logstash/filter-normalize-log-levels.conf
rename to modules/logstash/files/filter-normalize-log-levels.conf
diff --git a/files/logstash/filter-puppet.conf
b/modules/logstash/files/filter-puppet.conf
similarity index 100%
rename from files/logstash/filter-puppet.conf
rename to modules/logstash/files/filter-puppet.conf
diff --git a/files/logstash/filter-stashbot-bash.conf
b/modules/logstash/files/filter-stashbot-bash.conf
similarity index 100%
rename from files/logstash/filter-stashbot-bash.conf
rename to modules/logstash/files/filter-stashbot-bash.conf
diff --git a/files/logstash/filter-stashbot-sal.conf
b/modules/logstash/files/filter-stashbot-sal.conf
similarity index 100%
rename from files/logstash/filter-stashbot-sal.conf
rename to modules/logstash/files/filter-stashbot-sal.conf
diff --git a/files/logstash/filter-stashbot.conf
b/modules/logstash/files/filter-stashbot.conf
similarity index 100%
rename from files/logstash/filter-stashbot.conf
rename to modules/logstash/files/filter-stashbot.conf
diff --git a/files/logstash/filter-strip-ansi-color.conf
b/modules/logstash/files/filter-strip-ansi-color.conf
similarity index 100%
rename from files/logstash/filter-strip-ansi-color.conf
rename to modules/logstash/files/filter-strip-ansi-color.conf
diff --git a/files/logstash/filter-syslog.conf
b/modules/logstash/files/filter-syslog.conf
similarity index 100%
rename from files/logstash/filter-syslog.conf
rename to modules/logstash/files/filter-syslog.conf
diff --git a/files/logstash/filter-udp2log.conf
b/modules/logstash/files/filter-udp2log.conf
similarity index 100%
rename from files/logstash/filter-udp2log.conf
rename to modules/logstash/files/filter-udp2log.conf
diff --git a/files/logstash/stashbot-bash-template.json
b/modules/logstash/files/stashbot-bash-template.json
similarity index 100%
rename from files/logstash/stashbot-bash-template.json
rename to modules/logstash/files/stashbot-bash-template.json
diff --git a/files/logstash/stashbot-sal-template.json
b/modules/logstash/files/stashbot-sal-template.json
similarity index 100%
rename from files/logstash/stashbot-sal-template.json
rename to modules/logstash/files/stashbot-sal-template.json
diff --git a/files/logstash/stashbot-template.json
b/modules/logstash/files/stashbot-template.json
similarity index 100%
rename from files/logstash/stashbot-template.json
rename to modules/logstash/files/stashbot-template.json
--
To view, visit https://gerrit.wikimedia.org/r/249062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I631be974b4436cf998a91af3f48fa3723eea496d
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
