Skip to content

Fix rake #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 22, 2021
Merged

Fix rake #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9584738
Update rake file
VijayanB Jun 22, 2021
cc07daa
Fix typo
VijayanB Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: |
./scripts/opendistro/docker-run.sh

- name: Build and pull docker files for opensearch
- name: Build and pull docker files for OpenSearch
env:
OPENSEARCH_VERSION: "1.0.0-rc1"
LOGSTASH_VERSION: "7.13.2"
Expand Down
10 changes: 5 additions & 5 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ ECS_LOGSTASH_INDEX_PATTERNS = %w(
)

task :'vendor-ecs-schemata' do
download_ecs_schema(:v1, 7)
download_ecs_schema(:v1)
end
task :vendor => :'vendor-ecs-schemata'

def download_ecs_schema(ecs_major_version, es_major)
$stderr.puts("Vendoring ECS #{ecs_major_version} template for Elasticsearch #{es_major}")
def download_ecs_schema(ecs_major_version)
$stderr.puts("Vendoring ECS #{ecs_major_version} template")
require 'net/http'
require 'json'
Net::HTTP.start('raw.githubusercontent.com', :use_ssl => true) do |http|
ecs_release_tag = ECS_VERSIONS.fetch(ecs_major_version)
response = http.get("/elastic/ecs/#{ecs_release_tag}/generated/elasticsearch/#{es_major}/template.json")
response = http.get("/elastic/ecs/#{ecs_release_tag}/generated/elasticsearch/7/template.json")
fail "#{response.code} #{response.message}" unless (200...300).cover?(response.code.to_i)
template_directory = File.expand_path("../lib/logstash/outputs/opensearch/templates/ecs-#{ecs_major_version}", __FILE__)
Dir.mkdir(template_directory) unless File.exists?(template_directory)
File.open(File.join(template_directory, "/elasticsearch-#{es_major}x.json"), "w") do |handle|
File.open(File.join(template_directory, "/template.json"), "w") do |handle|
handle.write(replace_index_patterns(response.body, ECS_LOGSTASH_INDEX_PATTERNS))
end
end
Expand Down