fix filebeat tests

remove abandoned filebeat configs
mlibrary · Oct 15, 2024 · 20e7c3e · 20e7c3e
1 parent f4acd20
commit 20e7c3e
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 119 deletions.
diff --git a/manifests/profile/elastic/filebeat/configs/clickstream.pp b/manifests/profile/elastic/filebeat/configs/clickstream.pp
diff --git a/manifests/profile/elastic/filebeat/configs/mgetit.pp b/manifests/profile/elastic/filebeat/configs/mgetit.pp
diff --git a/manifests/role/mgetit_log.pp b/manifests/role/mgetit_log.pp
diff --git a/manifests/role/webhost/www_lib_vm.pp b/manifests/role/webhost/www_lib_vm.pp
@@ -12,7 +12,6 @@
   Hash $hosts = {}
 ) {
   include nebula::role::umich
-  include nebula::profile::elastic::filebeat::configs::clickstream
   include nebula::profile::www_lib::register_for_load_balancing
 
   class { 'nebula::profile::networking::private':

diff --git a/spec/classes/profile/elastic/filebeat/configs/clickstream_spec.rb b/spec/classes/profile/elastic/filebeat/configs/clickstream_spec.rb
diff --git a/spec/classes/profile/elastic/filebeat/configs/mgetit_spec.rb b/spec/classes/profile/elastic/filebeat/configs/mgetit_spec.rb
diff --git a/spec/classes/profile/elastic/filebeat/configs/ulib_spec.rb b/spec/classes/profile/elastic/filebeat/configs/ulib_spec.rb
@@ -19,7 +19,7 @@
         it do
           is_expected.to contain_file(file)
             .that_notifies('Service[filebeat]')
-            .with_content(%r{^\s+document_type: ulib$})
+            .with_content(%r{^\s+ulib_type: 90_day$})
         end
         it { is_expected.to contain_file(file).with_content(%r{^    \- "/var/log/1.log"$}) }
         it { is_expected.to contain_file(file).with_content(%r{^    \- "/var/log/logger/2.txt"$}) }

diff --git a/spec/classes/profile/elastic/filebeat_spec.rb b/spec/classes/profile/elastic/filebeat_spec.rb
@@ -29,7 +29,7 @@
       end
 
       [
-        %r{^\s*config_dir: configs$},
+        %r{^\s*path: configs/\*.yml$},
         %r{^\s*hosts:.*"logstash.umdl.umich.edu:5044"},
       ].each do |content|
         it { is_expected.to contain_file('/etc/filebeat/filebeat.yml').with_content(content) }

diff --git a/spec/classes/profile/elastic_spec.rb b/spec/classes/profile/elastic_spec.rb
@@ -13,7 +13,7 @@
       it do
         is_expected.to contain_apt__source('elastic.co').with(
           comment: 'Elastic.co apt source for beats and elastic search',
-          location: 'https://artifacts.elastic.co/packages/5.x/apt',
+          location: 'https://artifacts.elastic.co/packages/7.x/apt',
           release: 'stable',
           repos: 'main',
           include: {

diff --git a/spec/fixtures/hiera/default.yaml b/spec/fixtures/hiera/default.yaml
@@ -23,7 +23,6 @@ nebula::profile::dns::smartconnect::nameserver: 1.2.3.4
 nebula::profile::elastic::logstash_auth_cert: ''
 nebula::profile::elastic::logstash_hosts:
 - logstash.default.invalid:1234
-nebula::profile::elastic::filebeat::configs::mgetit::log_path: /var/log/mgetit.default.invalid
 nebula::profile::elastic::period: 90
 nebula::profile::haproxy::services: {}
 nebula::profile::haproxy::monitoring_user: