update beats master branch ref to main (#1853)

* update beats master branch ref to main

* update filename of master beat schema to main

* delete old main beats schema

* rebuilt main beats archive

(cherry picked from commit 84b7ce6582)
This commit is contained in:
Mika Ayenson
2022-03-18 10:06:34 -04:00
committed by github-actions[bot]
parent b7d064d210
commit a951b99c13
5 changed files with 10 additions and 10 deletions
+6 -6
View File
@@ -95,9 +95,9 @@ def download_latest_beats_schema():
download_beats_schema(latest_release["tag_name"])
def refresh_master_schema():
"""Download and refresh beats schema from master."""
_decompress_and_save_schema('https://github.com/elastic/beats/archive/master.zip', 'master')
def refresh_main_schema():
"""Download and refresh beats schema from main."""
_decompress_and_save_schema('https://github.com/elastic/beats/archive/main.zip', 'main')
def _flatten_schema(schema: list, prefix="") -> list:
@@ -123,7 +123,7 @@ def _flatten_schema(schema: list, prefix="") -> list:
elif "name" in s:
s = s.copy()
# type is implicitly keyword if not defined
# example: https://github.com/elastic/beats/blob/master/packetbeat/_meta/fields.common.yml#L7-L12
# example: https://github.com/elastic/beats/blob/main/packetbeat/_meta/fields.common.yml#L7-L12
s.setdefault("type", "keyword")
s["name"] = prefix + s["name"]
flattened.append(s)
@@ -198,8 +198,8 @@ def get_max_version() -> str:
@cached
def read_beats_schema(version: str = None):
if version and version.lower() == 'master':
return json.loads(read_gzip(get_etc_path('beats_schemas', 'master.json.gz')))
if version and version.lower() == 'main':
return json.loads(read_gzip(get_etc_path('beats_schemas', 'main.json.gz')))
version = Version(version) if version else None
beats_schemas = get_versions()
+1 -1
View File
@@ -230,6 +230,6 @@ def get_stack_schemas(stack_version: str) -> Dict[str, dict]:
if (mapped_version := Version(k)) >= stack_version and mapped_version <= current_package and v}
if stack_version > current_package:
versions[stack_version] = {'beats': 'master', 'ecs': 'master'}
versions[stack_version] = {'beats': 'main', 'ecs': 'master'}
return versions
Binary file not shown.
Binary file not shown.
+3 -3
View File
@@ -2,7 +2,7 @@
# ECS versions do not align perfectly with stack releases (as of 7.13), so this will reflect MAX ecs version for a
# given release
#
# refer to release branch in https://github.com/elastic/beats/blob/master/libbeat/_meta/fields.ecs.yml
# refer to release branch in https://github.com/elastic/beats/blob/main/libbeat/_meta/fields.ecs.yml
"7.13.0":
# beats release about the same time as the stack, so we cannot update this until it is released
@@ -28,9 +28,9 @@
ecs: "1.12.1"
"8.1.0":
beats: "master" # TODO: update this once beats releases
beats: "main" # TODO: update this once beats releases
ecs: "1.12.1"
"8.2.0":
beats: "master" # TODO: update this once beats releases
beats: "main" # TODO: update this once beats releases
ecs: "1.12.1"