Merge pull request #1106 from lsst-it/IT-5152/rsyslog-to-opensearch

(site/dev) send syslog/tls to rsyslog.fluent.ayekan.dev.lsst.org:5140
lsst-it · Mar 28, 2024 · f7562ad · f7562ad
2 parents 34acab0 + a496eeb
commit f7562ad
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/hieradata/site/dev.yaml b/hieradata/site/dev.yaml
@@ -2,16 +2,20 @@
 ipa::ipa_master_fqdn: "ipa1.ls.lsst.org"
 rsyslog::feature_packages:
   - "rsyslog-elasticsearch"
+  - "rsyslog-openssl"
 rsyslog::config::modules:
   omelasticsearch: {}
 rsyslog::config::actions:
-  graylogls:
+  fluentbit_dev:
     type: "omfwd"
     facility: "*.*"
     config:
-      Target: "collector.ls.lsst.org"
-      Port: 5514
-      Protocol: "udp"
+      target: "rsyslog.fluent.ayekan.dev.lsst.org"
+      port: 5140
+      protocol: "tcp"
+      StreamDriver: "ossl"
+      StreamDriverMode: "1"
+      StreamDriverAuthMode: "anon"
   opensearch:
     type: "omelasticsearch"
     facility: "*.*"

diff --git a/spec/support/spec/rsyslog.rb b/spec/support/spec/rsyslog.rb
@@ -101,16 +101,20 @@
     end
   when 'dev'
     it { is_expected.to contain_package('rsyslog-elasticsearch') }
+    it { is_expected.to contain_package('rsyslog-openssl') }
     it { is_expected.to contain_rsyslog__component__module('omelasticsearch') }
 
     it do
-      is_expected.to contain_rsyslog__component__action('graylogls').with(
+      is_expected.to contain_rsyslog__component__action('fluentbit_dev').with(
         type: 'omfwd',
         facility: '*.*',
         config: {
-          'Target' => 'collector.ls.lsst.org',
-          'Port' => '5514',
-          'Protocol' => 'udp',
+          'target' => 'rsyslog.fluent.ayekan.dev.lsst.org',
+          'port' => '5140',
+          'protocol' => 'tcp',
+          'StreamDriver' => 'ossl',
+          'StreamDriverMode' => '1',
+          'StreamDriverAuthMode' => 'anon',
         },
       )
     end