BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233866
Change subject: Logstash: make sure all input defines deal with ferm
......................................................................
Logstash: make sure all input defines deal with ferm
* Add ferm::service to logstash::input::tcp
* Add note about ferm::service to logstash::input::irc
* Add note about ferm::service to logstash::input::redis
None of these inputs are used in WMF production today, but they are used
in beta cluster and/or labs projects. Having the ferm::service
ready/noted may make debugging things later easier.
Change-Id: I7f29e3b736af7833b77a3512a610f13de1dd01e0
---
M modules/logstash/manifests/input/irc.pp
M modules/logstash/manifests/input/redis.pp
M modules/logstash/manifests/input/tcp.pp
3 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/233866/1
diff --git a/modules/logstash/manifests/input/irc.pp
b/modules/logstash/manifests/input/irc.pp
index 8c6bc11..0e90949 100644
--- a/modules/logstash/manifests/input/irc.pp
+++ b/modules/logstash/manifests/input/irc.pp
@@ -39,4 +39,6 @@
content => template('logstash/input/irc.erb'),
priority => $priority,
}
+
+ # ferm::service not needed as irc connection is made outbound
}
diff --git a/modules/logstash/manifests/input/redis.pp
b/modules/logstash/manifests/input/redis.pp
index 00a3e93..ea3576a 100644
--- a/modules/logstash/manifests/input/redis.pp
+++ b/modules/logstash/manifests/input/redis.pp
@@ -35,4 +35,6 @@
content => template('logstash/input/redis.erb'),
priority => $priority,
}
+
+ # ferm::service not needed as connection is made outbound
}
diff --git a/modules/logstash/manifests/input/tcp.pp
b/modules/logstash/manifests/input/tcp.pp
index eb3827e..09148d1 100644
--- a/modules/logstash/manifests/input/tcp.pp
+++ b/modules/logstash/manifests/input/tcp.pp
@@ -28,4 +28,10 @@
content => template('logstash/input/tcp.erb'),
priority => $priority,
}
+
+ ferm::service { "logstash_tcp_${title}":
+ proto => 'tcp',
+ port => $port,
+ srange => '$INTERNAL',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/233866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f29e3b736af7833b77a3512a610f13de1dd01e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
