From 6ff57ec092753e229c35cc0868e1c667b2ce0bfa Mon Sep 17 00:00:00 2001
From: ts <thomashaw@localhost.localdomain>
Date: Mon, 9 Dec 2019 13:11:13 +0000
Subject: [PATCH] updated yml to yaml, copy rules directory

---
 .../logging/elastalert/files/elastalert.service |  2 +-
 .../elastalert/files/rules/example-rule.yaml    |  1 +
 .../unix/logging/elastalert/manifests/config.pp | 17 ++++++++++++-----
 .../{config.yml.erb => config.yaml.erb}         |  0
 4 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 modules/utilities/unix/logging/elastalert/files/rules/example-rule.yaml
 rename modules/utilities/unix/logging/elastalert/templates/{config.yml.erb => config.yaml.erb} (100%)

diff --git a/modules/utilities/unix/logging/elastalert/files/elastalert.service b/modules/utilities/unix/logging/elastalert/files/elastalert.service
index f3e529972..1ea184924 100644
--- a/modules/utilities/unix/logging/elastalert/files/elastalert.service
+++ b/modules/utilities/unix/logging/elastalert/files/elastalert.service
@@ -5,7 +5,7 @@ After=elasticsearch.service
 [Service]
 Type=simple
 WorkingDirectory=/opt/elastalert
-ExecStart=/usr/local/bin/elastalert --verbose --config /opt/elastalert/config.yml
+ExecStart=/usr/local/bin/elastalert --verbose --config /opt/elastalert/config.yaml
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/modules/utilities/unix/logging/elastalert/files/rules/example-rule.yaml b/modules/utilities/unix/logging/elastalert/files/rules/example-rule.yaml
new file mode 100644
index 000000000..d34799133
--- /dev/null
+++ b/modules/utilities/unix/logging/elastalert/files/rules/example-rule.yaml
@@ -0,0 +1 @@
+# TODO: Replace me with a real rule.
\ No newline at end of file
diff --git a/modules/utilities/unix/logging/elastalert/manifests/config.pp b/modules/utilities/unix/logging/elastalert/manifests/config.pp
index c336e712b..bbe638934 100644
--- a/modules/utilities/unix/logging/elastalert/manifests/config.pp
+++ b/modules/utilities/unix/logging/elastalert/manifests/config.pp
@@ -2,16 +2,23 @@ class elastalert::config {
   $secgen_parameters = secgen_functions::get_parameters($::base64_inputs_file)
   $elasticsearch_ip = $secgen_parameters['elasticsearch_ip'][0]
   $elasticsearch_port = 0 + $secgen_parameters['elasticsearch_port'][0]
+  $elastalert_dir = '/opt/elastalert/'
+  $rules_dir = '/opt/elastalert/rules/'
 
-
-  file { ['/opt/elastalert/', '/opt/elastalert/rules/']:
+  file { $elastalert_dir:
     ensure => directory,
   }
 
-  file { '/opt/elastalert/config.yml':
+  file { '/opt/elastalert/config.yaml':
     ensure => file,
-    content => template('elastalert/config.yml.erb'),
-    require => File['/opt/elastalert/'],
+    content => template('elastalert/config.yaml.erb'),
+    require => File[$elastalert_dir],
   }
 
+  file { $rules_dir:
+    ensure => directory,
+    recurse => true,
+    source => 'puppet:///modules/elastalert/rules/',
+    require => File[$elastalert_dir],
+  }
 }
\ No newline at end of file
diff --git a/modules/utilities/unix/logging/elastalert/templates/config.yml.erb b/modules/utilities/unix/logging/elastalert/templates/config.yaml.erb
similarity index 100%
rename from modules/utilities/unix/logging/elastalert/templates/config.yml.erb
rename to modules/utilities/unix/logging/elastalert/templates/config.yaml.erb