Merge branch 'master' into hash-each-pair-return

tylerjl · tylerjl · commit 8d9bfeef8506 · 2019-02-22T14:14:32.000-07:00
diff --git a/spec/acceptance/tests/acceptance_spec.rb b/spec/acceptance/tests/acceptance_spec.rb
@@ -64,7 +64,7 @@
       api_timeout => 60,
       config => {
         'cluster.name' => '#{v[:cluster_name]}',
-        'network.host' => '0.0.0.0',
+        'http.bind_host' => '0.0.0.0',
       },
       oss => #{v[:oss]},
       #{package}
diff --git a/spec/fixtures/hiera/hieradata/envs/defaultinstance-merged.yaml b/spec/fixtures/hiera/hieradata/envs/defaultinstance-merged.yaml
@@ -7,4 +7,4 @@ elasticsearch::instances:
   default:
     config:
       node.name: 'default'
-      network.host: '0.0.0.0'
+      http.bind_host: '0.0.0.0'
diff --git a/spec/fixtures/hiera/hieradata/envs/defaultinstance.yaml b/spec/fixtures/hiera/hieradata/envs/defaultinstance.yaml
@@ -3,4 +3,4 @@ elasticsearch::instances:
   default:
     config:
       node.name: 'default'
-      network.host: '0.0.0.0'
+      http.bind_host: '0.0.0.0'
diff --git a/spec/fixtures/hiera/hieradata/multipleinstances.yaml b/spec/fixtures/hiera/hieradata/multipleinstances.yaml
@@ -3,8 +3,8 @@ elasticsearch::instances:
   es-hiera-multiple-1:
     config:
       node.name: 'es-hiera-multiple-1'
-      network.host: '0.0.0.0'
+      http.bind_host: '0.0.0.0'
   es-hiera-multiple-2:
     config:
       node.name: 'es-hiera-multiple-2'
-      network.host: '0.0.0.0'
+      http.bind_host: '0.0.0.0'
diff --git a/spec/fixtures/hiera/hieradata/singleinstance.yaml b/spec/fixtures/hiera/hieradata/singleinstance.yaml
@@ -3,4 +3,4 @@ elasticsearch::instances:
   es-hiera-single:
     config:
       node.name: 'es-hiera-single'
-      network.host: '0.0.0.0'
+      http.bind_host: '0.0.0.0'
diff --git a/spec/fixtures/hiera/hieradata/singleplugin.yaml b/spec/fixtures/hiera/hieradata/singleplugin.yaml
@@ -3,7 +3,7 @@ elasticsearch::instances:
   es-hiera-single:
     config:
       node.name: 'es-01'
-      network.host: '0.0.0.0'
+      http.bind_host: '0.0.0.0'
 elasticsearch::plugins:
   'mobz/elasticsearch-head':
     ensure: 'present'
diff --git a/spec/fixtures/templates/post_8.0.json b/spec/fixtures/templates/post_8.0.json
@@ -0,0 +1,57 @@
+{
+  "index_patterns": [ "logstash-*" ],
+  "version": 123,
+  "settings": {
+    "index": {
+      "refresh_interval": "5s",
+      "analysis": {
+        "analyzer": {
+          "default": {
+            "type": "standard",
+            "stopwords": "_none_"
+          }
+        }
+      }
+    }
+  },
+  "mappings": {
+    "dynamic_templates": [
+      {
+        "string_fields": {
+          "match": "*",
+          "match_mapping_type": "string",
+          "mapping": {
+            "type": "multi_field",
+            "fields": {
+              "{name}": {
+                "type": "text",
+                "index": "analyzed",
+                "omit_norms": true
+              },
+              "raw": {
+                "type ": "text",
+                "index": "not_analyzed",
+                "ignore_above": 256
+              }
+            }
+          }
+        }
+      }
+    ],
+    "properties": {
+      "@version": {
+        "type": "text",
+        "index": false
+      },
+      "geoip": {
+        "type": "object",
+        "dynamic": true,
+        "properties": {
+          "location": {
+            "type": "geo_point"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/spec/helpers/acceptance/tests/hiera_shared_examples.rb b/spec/helpers/acceptance/tests/hiera_shared_examples.rb
@@ -95,14 +95,14 @@
         'es-hiera-multiple-1' => {
           'config' => {
             'node.name' => 'es-hiera-multiple-1',
-            'network.host' => '0.0.0.0',
+            'http.bind_host' => '0.0.0.0',
             'http.port' => 9201
           }
         },
         'es-hiera-multiple-2' => {
           'config' => {
             'node.name' => 'es-hiera-multiple-2',
-            'network.host' => '0.0.0.0',
+            'http.bind_host' => '0.0.0.0',
             'http.port' => 9202
           }
         }
diff --git a/spec/helpers/acceptance/tests/manifest_shared_examples.rb b/spec/helpers/acceptance/tests/manifest_shared_examples.rb
@@ -41,7 +41,7 @@ class { 'elasticsearch' :
     end
 
     if idempotency_check
-      it 'is idempotent' do
+      it 'is idempotent', :logs_on_failure do
         apply_manifest applied_manifest, :catch_changes => true
       end
     end
diff --git a/spec/helpers/acceptance/tests/package_url_shared_examples.rb b/spec/helpers/acceptance/tests/package_url_shared_examples.rb
@@ -17,7 +17,7 @@
         <<-MANIFEST
           config => {
             'cluster.name' => '#{v[:cluster_name]}',
-            'network.host' => '0.0.0.0',
+            'http.bind_host' => '0.0.0.0',
           },
           manage_repo => false,
           package_url => '#{v[:elasticsearch_package][:url]}'
@@ -38,7 +38,7 @@
         <<-MANIFEST
           config => {
             'cluster.name' => '#{v[:cluster_name]}',
-            'network.host' => '0.0.0.0',
+            'http.bind_host' => '0.0.0.0',
           },
           manage_repo => false,
           package_url => 'file:/tmp/#{v[:elasticsearch_package][:filename]}'
@@ -61,7 +61,7 @@
         <<-MANIFEST
           config => {
             'cluster.name' => '#{v[:cluster_name]}',
-            'network.host' => '0.0.0.0',
+            'http.bind_host' => '0.0.0.0',
           },
           manage_repo => false,
           package_url =>
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -29,6 +29,8 @@ def f
     v[:elasticsearch_package] = {}
     v[:template] = if v[:elasticsearch_major_version] < 6
                      JSON.load(File.new('spec/fixtures/templates/pre_6.0.json'))
+                   elsif v[:elasticsearch_major_version] >= 8
+                     JSON.load(File.new('spec/fixtures/templates/post_8.0.json'))
                    else
                      JSON.load(File.new('spec/fixtures/templates/post_6.0.json'))
                    end
@@ -125,6 +127,17 @@ class { 'elasticsearch':
   c.before :context, :first_purge do
     shell 'rm -rf {/usr/share,/etc,/var/lib}/elasticsearch*'
   end
+
+  # Provide a hook filter to spit out some ES logs if the example fails.
+  c.after(:example, :logs_on_failure) do |example|
+    if example.exception
+      hosts.each do |host|
+        on host, "find / -name '#{v[:cluster_name]}.log' | xargs cat || true" do |result|
+          puts result.formatted_output
+        end
+      end
+    end
+  end
 end
 
 files_dir = ENV['files_dir'] || './spec/fixtures/artifacts'
@@ -259,17 +272,6 @@ class { "java" :
       MANIFEST
     end
   end
-
-  c.after :suite do
-    if ENV['ES_VERSION']
-      hosts.each do |host|
-        timestamp = Time.now
-        log_dir = File.join('./spec/logs', timestamp.strftime('%F_%H_%M_%S'))
-        FileUtils.mkdir_p(log_dir) unless File.directory?(log_dir)
-        scp_from(host, '/var/log/elasticsearch', log_dir)
-      end
-    end
-  end
 end
 
 # Java 8 is only easy to manage on recent distros

Original file line number	Diff line number	Diff line change
`@@ -95,14 +95,14 @@`
`95`	`95`	`'es-hiera-multiple-1' => {`
`96`	`96`	`'config' => {`
`97`	`97`	`'node.name' => 'es-hiera-multiple-1',`
`98`		`- 'network.host' => '0.0.0.0',`
	`98`	`+ 'http.bind_host' => '0.0.0.0',`
`99`	`99`	`'http.port' => 9201`
`100`	`100`	`}`
`101`	`101`	`},`
`102`	`102`	`'es-hiera-multiple-2' => {`
`103`	`103`	`'config' => {`
`104`	`104`	`'node.name' => 'es-hiera-multiple-2',`
`105`		`- 'network.host' => '0.0.0.0',`
	`105`	`+ 'http.bind_host' => '0.0.0.0',`
`106`	`106`	`'http.port' => 9202`
`107`	`107`	`}`
`108`	`108`	`}`