From 6003861532e39ae8624109711183c425ba8dc82e Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Wed, 15 Jun 2016 10:02:09 +0200 Subject: [PATCH] Rename _beat directories to _meta (#1854) --- Makefile | 2 ++ libbeat/{_beat => _meta}/config.full.yml | 0 libbeat/{_beat => _meta}/config.yml | 0 libbeat/{_beat => _meta}/fields.yml | 0 libbeat/scripts/Makefile | 4 ++-- libbeat/scripts/generate_fields_docs.py | 2 +- libbeat/scripts/generate_template.py | 2 +- libbeat/tests/system/beat/beat.py | 2 +- libbeat/tests/system/test_base.py | 2 +- metricbeat/Makefile | 4 ++-- metricbeat/docker-compose.yml | 4 ++-- .../docs/developer-guide/create-metricset.asciidoc | 7 +++---- .../docs/developer-guide/create-module.asciidoc | 2 +- metricbeat/docs/modules/apache/status.asciidoc | 4 ++-- metricbeat/docs/modules/mysql/status.asciidoc | 4 ++-- metricbeat/docs/modules/nginx/stubstatus.asciidoc | 4 ++-- metricbeat/docs/modules/redis/info.asciidoc | 4 ++-- metricbeat/docs/modules/redis/keyspace.asciidoc | 4 ++-- metricbeat/docs/modules/system/core.asciidoc | 4 ++-- metricbeat/docs/modules/system/cpu.asciidoc | 4 ++-- metricbeat/docs/modules/system/diskio.asciidoc | 4 ++-- metricbeat/docs/modules/system/filesystem.asciidoc | 4 ++-- metricbeat/docs/modules/system/fsstat.asciidoc | 4 ++-- metricbeat/docs/modules/system/memory.asciidoc | 4 ++-- metricbeat/docs/modules/system/network.asciidoc | 4 ++-- metricbeat/docs/modules/system/process.asciidoc | 4 ++-- metricbeat/docs/modules/zookeeper/mntr.asciidoc | 4 ++-- metricbeat/etc/{_beat => _meta}/fields_base.yml | 0 metricbeat/mb/testing/data_generator.go | 2 +- metricbeat/module/apache/{_beat => _meta}/Dockerfile | 0 .../module/apache/{_beat => _meta}/config.full.yml | 0 metricbeat/module/apache/{_beat => _meta}/config.yml | 0 .../module/apache/{_beat => _meta}/docs.asciidoc | 0 metricbeat/module/apache/{_beat => _meta}/fields.yml | 0 metricbeat/module/apache/{_beat => _meta}/httpd.conf | 0 .../module/apache/status/{_beat => _meta}/data.json | 0 .../apache/status/{_beat => _meta}/docs.asciidoc | 0 .../module/apache/status/{_beat => _meta}/fields.yml | 0 .../module/mysql/{_beat => _meta}/config.full.yml | 0 metricbeat/module/mysql/{_beat => _meta}/config.yml | 0 .../module/mysql/{_beat => _meta}/docs.asciidoc | 0 metricbeat/module/mysql/{_beat => _meta}/fields.yml | 0 .../kibana/dashboard/metricbeat-mysql.json | 0 .../kibana/visualization/metricbeat-mysql-open.json | 0 .../module/mysql/status/{_beat => _meta}/data.json | 0 .../mysql/status/{_beat => _meta}/docs.asciidoc | 0 .../module/mysql/status/{_beat => _meta}/fields.yml | 0 metricbeat/module/nginx/{_beat => _meta}/Dockerfile | 0 .../module/nginx/{_beat => _meta}/config.full.yml | 0 metricbeat/module/nginx/{_beat => _meta}/config.yml | 0 .../module/nginx/{_beat => _meta}/docs.asciidoc | 0 metricbeat/module/nginx/{_beat => _meta}/fields.yml | 0 metricbeat/module/nginx/{_beat => _meta}/nginx.conf | 0 .../nginx/stubstatus/{_beat => _meta}/data.json | 0 .../nginx/stubstatus/{_beat => _meta}/docs.asciidoc | 0 .../nginx/stubstatus/{_beat => _meta}/fields.yml | 0 .../module/redis/{_beat => _meta}/config.full.yml | 0 metricbeat/module/redis/{_beat => _meta}/config.yml | 0 .../module/redis/{_beat => _meta}/docs.asciidoc | 0 metricbeat/module/redis/{_beat => _meta}/fields.yml | 0 .../kibana/dashboard/metricbeat-redis.json | 0 .../kibana/index-pattern/metricbeat.json | 0 .../kibana/visualization/connected_clients.json | 0 .../kibana/visualization/connections-received.json | 0 .../module/redis/info/{_beat => _meta}/data.json | 0 .../module/redis/info/{_beat => _meta}/docs.asciidoc | 0 .../module/redis/info/{_beat => _meta}/fields.yml | 0 .../module/redis/keyspace/{_beat => _meta}/data.json | 0 .../redis/keyspace/{_beat => _meta}/docs.asciidoc | 0 .../redis/keyspace/{_beat => _meta}/fields.yml | 0 metricbeat/module/system/{_beat => _meta}/config.yml | 0 .../module/system/{_beat => _meta}/docs.asciidoc | 0 metricbeat/module/system/{_beat => _meta}/fields.yml | 0 .../dashboard/Metricbeat-System-Statistics.json | 0 .../kibana/index-pattern/metricbeat.json | 0 .../{_beat => _meta}/kibana/search/Cpu-stats.json | 0 .../kibana/search/Filesystem-stats.json | 0 .../kibana/search/Memory-search.json | 0 .../kibana/search/Process-stats.json | 0 .../{_beat => _meta}/kibana/search/System-stats.json | 0 .../kibana/visualization/CPU-usage-per-process.json | 0 .../kibana/visualization/CPU-usage.json | 0 .../visualization/Disk-utilization-over-time.json | 0 .../kibana/visualization/Filesystem-overview.json | 0 .../visualization/Memory-usage-per-process.json | 0 .../kibana/visualization/Memory-usage.json | 0 .../kibana/visualization/Servers-overview.json | 0 .../kibana/visualization/System-load.json | 0 .../kibana/visualization/Top-processes.json | 0 .../module/system/core/{_beat => _meta}/data.json | 0 .../system/core/{_beat => _meta}/docs.asciidoc | 0 .../module/system/core/{_beat => _meta}/fields.yml | 0 .../module/system/cpu/{_beat => _meta}/data.json | 0 .../module/system/cpu/{_beat => _meta}/docs.asciidoc | 0 .../module/system/cpu/{_beat => _meta}/fields.yml | 0 .../module/system/diskio/{_beat => _meta}/data.json | 0 .../system/diskio/{_beat => _meta}/docs.asciidoc | 0 .../module/system/diskio/{_beat => _meta}/fields.yml | 0 .../system/filesystem/{_beat => _meta}/data.json | 0 .../system/filesystem/{_beat => _meta}/docs.asciidoc | 0 .../system/filesystem/{_beat => _meta}/fields.yml | 0 .../module/system/fsstat/{_beat => _meta}/data.json | 0 .../system/fsstat/{_beat => _meta}/docs.asciidoc | 0 .../module/system/fsstat/{_beat => _meta}/fields.yml | 0 .../module/system/memory/{_beat => _meta}/data.json | 0 .../system/memory/{_beat => _meta}/docs.asciidoc | 0 .../module/system/memory/{_beat => _meta}/fields.yml | 0 .../module/system/network/{_beat => _meta}/data.json | 0 .../system/network/{_beat => _meta}/docs.asciidoc | 0 .../system/network/{_beat => _meta}/fields.yml | 0 .../module/system/process/{_beat => _meta}/data.json | 0 .../system/process/{_beat => _meta}/docs.asciidoc | 0 .../system/process/{_beat => _meta}/fields.yml | 0 .../module/zookeeper/{_beat => _meta}/config.yml | 0 .../module/zookeeper/{_beat => _meta}/docs.asciidoc | 0 .../module/zookeeper/{_beat => _meta}/fields.yml | 0 .../module/zookeeper/mntr/{_beat => _meta}/data.json | 0 .../zookeeper/mntr/{_beat => _meta}/docs.asciidoc | 0 .../zookeeper/mntr/{_beat => _meta}/fields.yml | 0 metricbeat/scripts/config_collector.py | 2 +- metricbeat/scripts/create_metricset.py | 4 ++-- metricbeat/scripts/docs_collector.py | 12 ++++++------ metricbeat/scripts/fields_collector.py | 4 ++-- metricbeat/scripts/generate_imports.py | 4 ++-- 124 files changed, 58 insertions(+), 57 deletions(-) rename libbeat/{_beat => _meta}/config.full.yml (100%) rename libbeat/{_beat => _meta}/config.yml (100%) rename libbeat/{_beat => _meta}/fields.yml (100%) rename metricbeat/etc/{_beat => _meta}/fields_base.yml (100%) rename metricbeat/module/apache/{_beat => _meta}/Dockerfile (100%) rename metricbeat/module/apache/{_beat => _meta}/config.full.yml (100%) rename metricbeat/module/apache/{_beat => _meta}/config.yml (100%) rename metricbeat/module/apache/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/apache/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/apache/{_beat => _meta}/httpd.conf (100%) rename metricbeat/module/apache/status/{_beat => _meta}/data.json (100%) rename metricbeat/module/apache/status/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/apache/status/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/mysql/{_beat => _meta}/config.full.yml (100%) rename metricbeat/module/mysql/{_beat => _meta}/config.yml (100%) rename metricbeat/module/mysql/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/mysql/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/mysql/{_beat => _meta}/kibana/dashboard/metricbeat-mysql.json (100%) rename metricbeat/module/mysql/{_beat => _meta}/kibana/visualization/metricbeat-mysql-open.json (100%) rename metricbeat/module/mysql/status/{_beat => _meta}/data.json (100%) rename metricbeat/module/mysql/status/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/mysql/status/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/nginx/{_beat => _meta}/Dockerfile (100%) rename metricbeat/module/nginx/{_beat => _meta}/config.full.yml (100%) rename metricbeat/module/nginx/{_beat => _meta}/config.yml (100%) rename metricbeat/module/nginx/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/nginx/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/nginx/{_beat => _meta}/nginx.conf (100%) rename metricbeat/module/nginx/stubstatus/{_beat => _meta}/data.json (100%) rename metricbeat/module/nginx/stubstatus/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/nginx/stubstatus/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/redis/{_beat => _meta}/config.full.yml (100%) rename metricbeat/module/redis/{_beat => _meta}/config.yml (100%) rename metricbeat/module/redis/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/redis/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/redis/{_beat => _meta}/kibana/dashboard/metricbeat-redis.json (100%) rename metricbeat/module/redis/{_beat => _meta}/kibana/index-pattern/metricbeat.json (100%) rename metricbeat/module/redis/{_beat => _meta}/kibana/visualization/connected_clients.json (100%) rename metricbeat/module/redis/{_beat => _meta}/kibana/visualization/connections-received.json (100%) rename metricbeat/module/redis/info/{_beat => _meta}/data.json (100%) rename metricbeat/module/redis/info/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/redis/info/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/redis/keyspace/{_beat => _meta}/data.json (100%) rename metricbeat/module/redis/keyspace/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/redis/keyspace/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/{_beat => _meta}/config.yml (100%) rename metricbeat/module/system/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/dashboard/Metricbeat-System-Statistics.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/index-pattern/metricbeat.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/search/Cpu-stats.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/search/Filesystem-stats.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/search/Memory-search.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/search/Process-stats.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/search/System-stats.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/CPU-usage-per-process.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/CPU-usage.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/Disk-utilization-over-time.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/Filesystem-overview.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/Memory-usage-per-process.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/Memory-usage.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/Servers-overview.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/System-load.json (100%) rename metricbeat/module/system/{_beat => _meta}/kibana/visualization/Top-processes.json (100%) rename metricbeat/module/system/core/{_beat => _meta}/data.json (100%) rename metricbeat/module/system/core/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/core/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/cpu/{_beat => _meta}/data.json (100%) rename metricbeat/module/system/cpu/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/cpu/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/diskio/{_beat => _meta}/data.json (100%) rename metricbeat/module/system/diskio/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/diskio/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/filesystem/{_beat => _meta}/data.json (100%) rename metricbeat/module/system/filesystem/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/filesystem/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/fsstat/{_beat => _meta}/data.json (100%) rename metricbeat/module/system/fsstat/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/fsstat/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/memory/{_beat => _meta}/data.json (100%) rename metricbeat/module/system/memory/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/memory/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/network/{_beat => _meta}/data.json (100%) rename metricbeat/module/system/network/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/network/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/system/process/{_beat => _meta}/data.json (100%) rename metricbeat/module/system/process/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/system/process/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/zookeeper/{_beat => _meta}/config.yml (100%) rename metricbeat/module/zookeeper/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/zookeeper/{_beat => _meta}/fields.yml (100%) rename metricbeat/module/zookeeper/mntr/{_beat => _meta}/data.json (100%) rename metricbeat/module/zookeeper/mntr/{_beat => _meta}/docs.asciidoc (100%) rename metricbeat/module/zookeeper/mntr/{_beat => _meta}/fields.yml (100%) diff --git a/Makefile b/Makefile index f56005f22105..aa7ad11fc6fa 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,8 @@ update: .PHONY: clean clean: $(foreach var,$(PROJECTS),$(MAKE) -C $(var) clean || exit 1;) + $(MAKE) -C generate/beat clean + $(MAKE) -C generate/metricbeat/metricset clean .PHONY: check check: diff --git a/libbeat/_beat/config.full.yml b/libbeat/_meta/config.full.yml similarity index 100% rename from libbeat/_beat/config.full.yml rename to libbeat/_meta/config.full.yml diff --git a/libbeat/_beat/config.yml b/libbeat/_meta/config.yml similarity index 100% rename from libbeat/_beat/config.yml rename to libbeat/_meta/config.yml diff --git a/libbeat/_beat/fields.yml b/libbeat/_meta/fields.yml similarity index 100% rename from libbeat/_beat/fields.yml rename to libbeat/_meta/fields.yml diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile index 24d88007760b..48bfd2606258 100755 --- a/libbeat/scripts/Makefile +++ b/libbeat/scripts/Makefile @@ -221,9 +221,9 @@ update: python-env # Update config echo "Update config file" -rm -f etc/${BEATNAME}.yml - cat etc/beat.yml ${ES_BEATS}/libbeat/_beat/config.yml | sed -e "s/beatname/${BEATNAME}/g" > ${BEATNAME}.yml + cat etc/beat.yml ${ES_BEATS}/libbeat/_meta/config.yml | sed -e "s/beatname/${BEATNAME}/g" > ${BEATNAME}.yml -rm -f etc/${BEATNAME}.full.yml - cat etc/beat.full.yml ${ES_BEATS}/libbeat/_beat/config.full.yml | sed -e "s/beatname/${BEATNAME}/g" > ${BEATNAME}.full.yml + cat etc/beat.full.yml ${ES_BEATS}/libbeat/_meta/config.full.yml | sed -e "s/beatname/${BEATNAME}/g" > ${BEATNAME}.full.yml # Update fields echo "Update fields" diff --git a/libbeat/scripts/generate_fields_docs.py b/libbeat/scripts/generate_fields_docs.py index 4285cdc8f666..d4d79f243b35 100644 --- a/libbeat/scripts/generate_fields_docs.py +++ b/libbeat/scripts/generate_fields_docs.py @@ -115,7 +115,7 @@ def fields_to_asciidoc(input, output, beat): fields = f.read() # Prepends beat fields from libbeat - with open(es_beats + "/libbeat/_beat/fields.yml") as f: + with open(es_beats + "/libbeat/_meta/fields.yml") as f: fields = f.read() + fields output = open(beat_path + "/docs/fields.asciidoc", 'w') diff --git a/libbeat/scripts/generate_template.py b/libbeat/scripts/generate_template.py index 3c8b2862fdcf..7841197ca0d6 100644 --- a/libbeat/scripts/generate_template.py +++ b/libbeat/scripts/generate_template.py @@ -276,7 +276,7 @@ def fill_field_properties(args, field, defaults, path): fields = f.read() # Prepend beat fields from libbeat - with open(args.es_beats + "/libbeat/_beat/fields.yml") as f: + with open(args.es_beats + "/libbeat/_meta/fields.yml") as f: fields = f.read() + fields with open(target, 'w') as output: diff --git a/libbeat/tests/system/beat/beat.py b/libbeat/tests/system/beat/beat.py index 97576f5493d7..9dafde787f9f 100644 --- a/libbeat/tests/system/beat/beat.py +++ b/libbeat/tests/system/beat/beat.py @@ -407,7 +407,7 @@ def extract_fields(doc_list, name): # TODO: Make fields_doc path more generic to work with beat-generator with open(fields_doc, "r") as f: # TODO: Make this path more generic to work with beat-generator. - with open("../../../libbeat/_beat/fields.yml") as f2: + with open("../../../libbeat/_meta/fields.yml") as f2: content = f2.read() content += f.read() diff --git a/libbeat/tests/system/test_base.py b/libbeat/tests/system/test_base.py index 658d7971d489..c5b055a8c621 100644 --- a/libbeat/tests/system/test_base.py +++ b/libbeat/tests/system/test_base.py @@ -44,7 +44,7 @@ def test_config_test(self): """ Checks if -configtest works as expected """ - shutil.copy("../../_beat/config.yml", + shutil.copy("../../_meta/config.yml", os.path.join(self.working_dir, "libbeat.yml")) with open(self.working_dir + "/beatname.template.json", "w") as f: f.write('{"template": true}') diff --git a/metricbeat/Makefile b/metricbeat/Makefile index 3bd06e0c1170..40464009c2ee 100644 --- a/metricbeat/Makefile +++ b/metricbeat/Makefile @@ -20,13 +20,13 @@ include ${ES_BEATS}/libbeat/scripts/Makefile kibana: -rm -r etc/kibana mkdir -p etc/kibana - -cp -r module/*/_beat/kibana/ etc/kibana + -cp -r module/*/_meta/kibana/ etc/kibana # Collects all module and metricset fields .PHONY: fields fields: mkdir -p etc/ - cat ${ES_BEATS}/metricbeat/etc/_beat/fields_base.yml > etc/fields.yml + cat ${ES_BEATS}/metricbeat/etc/_meta/fields_base.yml > etc/fields.yml . ${PYTHON_ENV}/bin/activate; python ${ES_BEATS}/metricbeat/scripts/fields_collector.py >> etc/fields.yml # Collects all module docs diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml index 1041efec70bc..789b9868cd6b 100644 --- a/metricbeat/docker-compose.yml +++ b/metricbeat/docker-compose.yml @@ -32,7 +32,7 @@ kibana: # Modules apache: - build: ${PWD}/module/apache/_beat + build: ${PWD}/module/apache/_meta mysql: image: mysql:5.7.10 @@ -40,7 +40,7 @@ mysql: - MYSQL_ROOT_PASSWORD=test nginx: - build: ${PWD}/module/nginx/_beat + build: ${PWD}/module/nginx/_meta redis: image: redis:3.2.0 diff --git a/metricbeat/docs/developer-guide/create-metricset.asciidoc b/metricbeat/docs/developer-guide/create-metricset.asciidoc index 5c65838f28ed..22e37ad583c5 100644 --- a/metricbeat/docs/developer-guide/create-metricset.asciidoc +++ b/metricbeat/docs/developer-guide/create-metricset.asciidoc @@ -52,11 +52,10 @@ in debug mode with The MetricSet which was generated with its files can be found under `module/{module}/{metricset}`. This directory contains the following files: - * \{metricset}.go -* _beat/docs.asciidoc -* _beat/data.json -* _beat/fields.yml +* _meta/docs.asciidoc +* _meta/data.json +* _meta/fields.yml We will looking at each file in more detail below. diff --git a/metricbeat/docs/developer-guide/create-module.asciidoc b/metricbeat/docs/developer-guide/create-module.asciidoc index 878f2eb71e2c..83170a44a78e 100644 --- a/metricbeat/docs/developer-guide/create-module.asciidoc +++ b/metricbeat/docs/developer-guide/create-module.asciidoc @@ -4,7 +4,7 @@ Metricbeat modules are used to group multiple metricsets together and to impleme of the MetricSets. In most cases, no implementation of the module is needed and the default module implementation is automatically picked. -It is important to complete the configuration and documentation files for a module. All these files are in the `_beat` +It is important to complete the configuration and documentation files for a module. All these files are in the `_meta` directory and a default version is generate when using `make create-metricset`. [float] diff --git a/metricbeat/docs/modules/apache/status.asciidoc b/metricbeat/docs/modules/apache/status.asciidoc index a3f579294ef3..7a3cd34d945a 100644 --- a/metricbeat/docs/modules/apache/status.asciidoc +++ b/metricbeat/docs/modules/apache/status.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-apache-status]] -include::../../../module/apache/status/_beat/docs.asciidoc[] +include::../../../module/apache/status/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/apache/status/_beat/data.json[] +include::../../../module/apache/status/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/mysql/status.asciidoc b/metricbeat/docs/modules/mysql/status.asciidoc index 01d4e73e72d0..557a1b38a6a5 100644 --- a/metricbeat/docs/modules/mysql/status.asciidoc +++ b/metricbeat/docs/modules/mysql/status.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-mysql-status]] -include::../../../module/mysql/status/_beat/docs.asciidoc[] +include::../../../module/mysql/status/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/mysql/status/_beat/data.json[] +include::../../../module/mysql/status/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/nginx/stubstatus.asciidoc b/metricbeat/docs/modules/nginx/stubstatus.asciidoc index 38791eefe21d..8666f6752bd2 100644 --- a/metricbeat/docs/modules/nginx/stubstatus.asciidoc +++ b/metricbeat/docs/modules/nginx/stubstatus.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-nginx-stubstatus]] -include::../../../module/nginx/stubstatus/_beat/docs.asciidoc[] +include::../../../module/nginx/stubstatus/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/nginx/stubstatus/_beat/data.json[] +include::../../../module/nginx/stubstatus/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/redis/info.asciidoc b/metricbeat/docs/modules/redis/info.asciidoc index 088621f5d756..2c9af8dcd838 100644 --- a/metricbeat/docs/modules/redis/info.asciidoc +++ b/metricbeat/docs/modules/redis/info.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-redis-info]] -include::../../../module/redis/info/_beat/docs.asciidoc[] +include::../../../module/redis/info/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/redis/info/_beat/data.json[] +include::../../../module/redis/info/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/redis/keyspace.asciidoc b/metricbeat/docs/modules/redis/keyspace.asciidoc index c1b6617da5e8..a92e302b4f96 100644 --- a/metricbeat/docs/modules/redis/keyspace.asciidoc +++ b/metricbeat/docs/modules/redis/keyspace.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-redis-keyspace]] -include::../../../module/redis/keyspace/_beat/docs.asciidoc[] +include::../../../module/redis/keyspace/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/redis/keyspace/_beat/data.json[] +include::../../../module/redis/keyspace/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/system/core.asciidoc b/metricbeat/docs/modules/system/core.asciidoc index 467b2ee72f61..5ce1f31e0712 100644 --- a/metricbeat/docs/modules/system/core.asciidoc +++ b/metricbeat/docs/modules/system/core.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-system-core]] -include::../../../module/system/core/_beat/docs.asciidoc[] +include::../../../module/system/core/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/system/core/_beat/data.json[] +include::../../../module/system/core/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/system/cpu.asciidoc b/metricbeat/docs/modules/system/cpu.asciidoc index db892fcae62e..cb3c384ca839 100644 --- a/metricbeat/docs/modules/system/cpu.asciidoc +++ b/metricbeat/docs/modules/system/cpu.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-system-cpu]] -include::../../../module/system/cpu/_beat/docs.asciidoc[] +include::../../../module/system/cpu/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/system/cpu/_beat/data.json[] +include::../../../module/system/cpu/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/system/diskio.asciidoc b/metricbeat/docs/modules/system/diskio.asciidoc index 7fd7487a0404..20362d349a0e 100644 --- a/metricbeat/docs/modules/system/diskio.asciidoc +++ b/metricbeat/docs/modules/system/diskio.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-system-diskio]] -include::../../../module/system/diskio/_beat/docs.asciidoc[] +include::../../../module/system/diskio/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/system/diskio/_beat/data.json[] +include::../../../module/system/diskio/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/system/filesystem.asciidoc b/metricbeat/docs/modules/system/filesystem.asciidoc index d07b6cf7cdb9..297b069fc274 100644 --- a/metricbeat/docs/modules/system/filesystem.asciidoc +++ b/metricbeat/docs/modules/system/filesystem.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-system-filesystem]] -include::../../../module/system/filesystem/_beat/docs.asciidoc[] +include::../../../module/system/filesystem/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/system/filesystem/_beat/data.json[] +include::../../../module/system/filesystem/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/system/fsstat.asciidoc b/metricbeat/docs/modules/system/fsstat.asciidoc index 76f156311fb3..16153088c2a1 100644 --- a/metricbeat/docs/modules/system/fsstat.asciidoc +++ b/metricbeat/docs/modules/system/fsstat.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-system-fsstat]] -include::../../../module/system/fsstat/_beat/docs.asciidoc[] +include::../../../module/system/fsstat/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/system/fsstat/_beat/data.json[] +include::../../../module/system/fsstat/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/system/memory.asciidoc b/metricbeat/docs/modules/system/memory.asciidoc index 37cc77635de6..b31a2ccd9478 100644 --- a/metricbeat/docs/modules/system/memory.asciidoc +++ b/metricbeat/docs/modules/system/memory.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-system-memory]] -include::../../../module/system/memory/_beat/docs.asciidoc[] +include::../../../module/system/memory/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/system/memory/_beat/data.json[] +include::../../../module/system/memory/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/system/network.asciidoc b/metricbeat/docs/modules/system/network.asciidoc index 4fd54017d3c7..790dfeb5b1b9 100644 --- a/metricbeat/docs/modules/system/network.asciidoc +++ b/metricbeat/docs/modules/system/network.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-system-network]] -include::../../../module/system/network/_beat/docs.asciidoc[] +include::../../../module/system/network/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/system/network/_beat/data.json[] +include::../../../module/system/network/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/system/process.asciidoc b/metricbeat/docs/modules/system/process.asciidoc index fe84e6c6b66a..7565c7e4f392 100644 --- a/metricbeat/docs/modules/system/process.asciidoc +++ b/metricbeat/docs/modules/system/process.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-system-process]] -include::../../../module/system/process/_beat/docs.asciidoc[] +include::../../../module/system/process/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/system/process/_beat/data.json[] +include::../../../module/system/process/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/zookeeper/mntr.asciidoc b/metricbeat/docs/modules/zookeeper/mntr.asciidoc index 4b1a78cc96e9..01ba06f28ff7 100644 --- a/metricbeat/docs/modules/zookeeper/mntr.asciidoc +++ b/metricbeat/docs/modules/zookeeper/mntr.asciidoc @@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py //// [[metricbeat-metricset-zookeeper-mntr]] -include::../../../module/zookeeper/mntr/_beat/docs.asciidoc[] +include::../../../module/zookeeper/mntr/_meta/docs.asciidoc[] ==== Fields @@ -15,5 +15,5 @@ Below is an example document generated by this metricset. [source,json] ---- -include::../../../module/zookeeper/mntr/_beat/data.json[] +include::../../../module/zookeeper/mntr/_meta/data.json[] ---- diff --git a/metricbeat/etc/_beat/fields_base.yml b/metricbeat/etc/_meta/fields_base.yml similarity index 100% rename from metricbeat/etc/_beat/fields_base.yml rename to metricbeat/etc/_meta/fields_base.yml diff --git a/metricbeat/mb/testing/data_generator.go b/metricbeat/mb/testing/data_generator.go index c18bcd014104..8e5cb3678ca8 100644 --- a/metricbeat/mb/testing/data_generator.go +++ b/metricbeat/mb/testing/data_generator.go @@ -70,7 +70,7 @@ func createEvent(event common.MapStr, m mb.MetricSet) error { output, _ := json.MarshalIndent(fullEvent, "", " ") - err = ioutil.WriteFile(path+"/_beat/data.json", output, 0644) + err = ioutil.WriteFile(path+"/_meta/data.json", output, 0644) if err != nil { return err } diff --git a/metricbeat/module/apache/_beat/Dockerfile b/metricbeat/module/apache/_meta/Dockerfile similarity index 100% rename from metricbeat/module/apache/_beat/Dockerfile rename to metricbeat/module/apache/_meta/Dockerfile diff --git a/metricbeat/module/apache/_beat/config.full.yml b/metricbeat/module/apache/_meta/config.full.yml similarity index 100% rename from metricbeat/module/apache/_beat/config.full.yml rename to metricbeat/module/apache/_meta/config.full.yml diff --git a/metricbeat/module/apache/_beat/config.yml b/metricbeat/module/apache/_meta/config.yml similarity index 100% rename from metricbeat/module/apache/_beat/config.yml rename to metricbeat/module/apache/_meta/config.yml diff --git a/metricbeat/module/apache/_beat/docs.asciidoc b/metricbeat/module/apache/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/apache/_beat/docs.asciidoc rename to metricbeat/module/apache/_meta/docs.asciidoc diff --git a/metricbeat/module/apache/_beat/fields.yml b/metricbeat/module/apache/_meta/fields.yml similarity index 100% rename from metricbeat/module/apache/_beat/fields.yml rename to metricbeat/module/apache/_meta/fields.yml diff --git a/metricbeat/module/apache/_beat/httpd.conf b/metricbeat/module/apache/_meta/httpd.conf similarity index 100% rename from metricbeat/module/apache/_beat/httpd.conf rename to metricbeat/module/apache/_meta/httpd.conf diff --git a/metricbeat/module/apache/status/_beat/data.json b/metricbeat/module/apache/status/_meta/data.json similarity index 100% rename from metricbeat/module/apache/status/_beat/data.json rename to metricbeat/module/apache/status/_meta/data.json diff --git a/metricbeat/module/apache/status/_beat/docs.asciidoc b/metricbeat/module/apache/status/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/apache/status/_beat/docs.asciidoc rename to metricbeat/module/apache/status/_meta/docs.asciidoc diff --git a/metricbeat/module/apache/status/_beat/fields.yml b/metricbeat/module/apache/status/_meta/fields.yml similarity index 100% rename from metricbeat/module/apache/status/_beat/fields.yml rename to metricbeat/module/apache/status/_meta/fields.yml diff --git a/metricbeat/module/mysql/_beat/config.full.yml b/metricbeat/module/mysql/_meta/config.full.yml similarity index 100% rename from metricbeat/module/mysql/_beat/config.full.yml rename to metricbeat/module/mysql/_meta/config.full.yml diff --git a/metricbeat/module/mysql/_beat/config.yml b/metricbeat/module/mysql/_meta/config.yml similarity index 100% rename from metricbeat/module/mysql/_beat/config.yml rename to metricbeat/module/mysql/_meta/config.yml diff --git a/metricbeat/module/mysql/_beat/docs.asciidoc b/metricbeat/module/mysql/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/mysql/_beat/docs.asciidoc rename to metricbeat/module/mysql/_meta/docs.asciidoc diff --git a/metricbeat/module/mysql/_beat/fields.yml b/metricbeat/module/mysql/_meta/fields.yml similarity index 100% rename from metricbeat/module/mysql/_beat/fields.yml rename to metricbeat/module/mysql/_meta/fields.yml diff --git a/metricbeat/module/mysql/_beat/kibana/dashboard/metricbeat-mysql.json b/metricbeat/module/mysql/_meta/kibana/dashboard/metricbeat-mysql.json similarity index 100% rename from metricbeat/module/mysql/_beat/kibana/dashboard/metricbeat-mysql.json rename to metricbeat/module/mysql/_meta/kibana/dashboard/metricbeat-mysql.json diff --git a/metricbeat/module/mysql/_beat/kibana/visualization/metricbeat-mysql-open.json b/metricbeat/module/mysql/_meta/kibana/visualization/metricbeat-mysql-open.json similarity index 100% rename from metricbeat/module/mysql/_beat/kibana/visualization/metricbeat-mysql-open.json rename to metricbeat/module/mysql/_meta/kibana/visualization/metricbeat-mysql-open.json diff --git a/metricbeat/module/mysql/status/_beat/data.json b/metricbeat/module/mysql/status/_meta/data.json similarity index 100% rename from metricbeat/module/mysql/status/_beat/data.json rename to metricbeat/module/mysql/status/_meta/data.json diff --git a/metricbeat/module/mysql/status/_beat/docs.asciidoc b/metricbeat/module/mysql/status/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/mysql/status/_beat/docs.asciidoc rename to metricbeat/module/mysql/status/_meta/docs.asciidoc diff --git a/metricbeat/module/mysql/status/_beat/fields.yml b/metricbeat/module/mysql/status/_meta/fields.yml similarity index 100% rename from metricbeat/module/mysql/status/_beat/fields.yml rename to metricbeat/module/mysql/status/_meta/fields.yml diff --git a/metricbeat/module/nginx/_beat/Dockerfile b/metricbeat/module/nginx/_meta/Dockerfile similarity index 100% rename from metricbeat/module/nginx/_beat/Dockerfile rename to metricbeat/module/nginx/_meta/Dockerfile diff --git a/metricbeat/module/nginx/_beat/config.full.yml b/metricbeat/module/nginx/_meta/config.full.yml similarity index 100% rename from metricbeat/module/nginx/_beat/config.full.yml rename to metricbeat/module/nginx/_meta/config.full.yml diff --git a/metricbeat/module/nginx/_beat/config.yml b/metricbeat/module/nginx/_meta/config.yml similarity index 100% rename from metricbeat/module/nginx/_beat/config.yml rename to metricbeat/module/nginx/_meta/config.yml diff --git a/metricbeat/module/nginx/_beat/docs.asciidoc b/metricbeat/module/nginx/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/nginx/_beat/docs.asciidoc rename to metricbeat/module/nginx/_meta/docs.asciidoc diff --git a/metricbeat/module/nginx/_beat/fields.yml b/metricbeat/module/nginx/_meta/fields.yml similarity index 100% rename from metricbeat/module/nginx/_beat/fields.yml rename to metricbeat/module/nginx/_meta/fields.yml diff --git a/metricbeat/module/nginx/_beat/nginx.conf b/metricbeat/module/nginx/_meta/nginx.conf similarity index 100% rename from metricbeat/module/nginx/_beat/nginx.conf rename to metricbeat/module/nginx/_meta/nginx.conf diff --git a/metricbeat/module/nginx/stubstatus/_beat/data.json b/metricbeat/module/nginx/stubstatus/_meta/data.json similarity index 100% rename from metricbeat/module/nginx/stubstatus/_beat/data.json rename to metricbeat/module/nginx/stubstatus/_meta/data.json diff --git a/metricbeat/module/nginx/stubstatus/_beat/docs.asciidoc b/metricbeat/module/nginx/stubstatus/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/nginx/stubstatus/_beat/docs.asciidoc rename to metricbeat/module/nginx/stubstatus/_meta/docs.asciidoc diff --git a/metricbeat/module/nginx/stubstatus/_beat/fields.yml b/metricbeat/module/nginx/stubstatus/_meta/fields.yml similarity index 100% rename from metricbeat/module/nginx/stubstatus/_beat/fields.yml rename to metricbeat/module/nginx/stubstatus/_meta/fields.yml diff --git a/metricbeat/module/redis/_beat/config.full.yml b/metricbeat/module/redis/_meta/config.full.yml similarity index 100% rename from metricbeat/module/redis/_beat/config.full.yml rename to metricbeat/module/redis/_meta/config.full.yml diff --git a/metricbeat/module/redis/_beat/config.yml b/metricbeat/module/redis/_meta/config.yml similarity index 100% rename from metricbeat/module/redis/_beat/config.yml rename to metricbeat/module/redis/_meta/config.yml diff --git a/metricbeat/module/redis/_beat/docs.asciidoc b/metricbeat/module/redis/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/redis/_beat/docs.asciidoc rename to metricbeat/module/redis/_meta/docs.asciidoc diff --git a/metricbeat/module/redis/_beat/fields.yml b/metricbeat/module/redis/_meta/fields.yml similarity index 100% rename from metricbeat/module/redis/_beat/fields.yml rename to metricbeat/module/redis/_meta/fields.yml diff --git a/metricbeat/module/redis/_beat/kibana/dashboard/metricbeat-redis.json b/metricbeat/module/redis/_meta/kibana/dashboard/metricbeat-redis.json similarity index 100% rename from metricbeat/module/redis/_beat/kibana/dashboard/metricbeat-redis.json rename to metricbeat/module/redis/_meta/kibana/dashboard/metricbeat-redis.json diff --git a/metricbeat/module/redis/_beat/kibana/index-pattern/metricbeat.json b/metricbeat/module/redis/_meta/kibana/index-pattern/metricbeat.json similarity index 100% rename from metricbeat/module/redis/_beat/kibana/index-pattern/metricbeat.json rename to metricbeat/module/redis/_meta/kibana/index-pattern/metricbeat.json diff --git a/metricbeat/module/redis/_beat/kibana/visualization/connected_clients.json b/metricbeat/module/redis/_meta/kibana/visualization/connected_clients.json similarity index 100% rename from metricbeat/module/redis/_beat/kibana/visualization/connected_clients.json rename to metricbeat/module/redis/_meta/kibana/visualization/connected_clients.json diff --git a/metricbeat/module/redis/_beat/kibana/visualization/connections-received.json b/metricbeat/module/redis/_meta/kibana/visualization/connections-received.json similarity index 100% rename from metricbeat/module/redis/_beat/kibana/visualization/connections-received.json rename to metricbeat/module/redis/_meta/kibana/visualization/connections-received.json diff --git a/metricbeat/module/redis/info/_beat/data.json b/metricbeat/module/redis/info/_meta/data.json similarity index 100% rename from metricbeat/module/redis/info/_beat/data.json rename to metricbeat/module/redis/info/_meta/data.json diff --git a/metricbeat/module/redis/info/_beat/docs.asciidoc b/metricbeat/module/redis/info/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/redis/info/_beat/docs.asciidoc rename to metricbeat/module/redis/info/_meta/docs.asciidoc diff --git a/metricbeat/module/redis/info/_beat/fields.yml b/metricbeat/module/redis/info/_meta/fields.yml similarity index 100% rename from metricbeat/module/redis/info/_beat/fields.yml rename to metricbeat/module/redis/info/_meta/fields.yml diff --git a/metricbeat/module/redis/keyspace/_beat/data.json b/metricbeat/module/redis/keyspace/_meta/data.json similarity index 100% rename from metricbeat/module/redis/keyspace/_beat/data.json rename to metricbeat/module/redis/keyspace/_meta/data.json diff --git a/metricbeat/module/redis/keyspace/_beat/docs.asciidoc b/metricbeat/module/redis/keyspace/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/redis/keyspace/_beat/docs.asciidoc rename to metricbeat/module/redis/keyspace/_meta/docs.asciidoc diff --git a/metricbeat/module/redis/keyspace/_beat/fields.yml b/metricbeat/module/redis/keyspace/_meta/fields.yml similarity index 100% rename from metricbeat/module/redis/keyspace/_beat/fields.yml rename to metricbeat/module/redis/keyspace/_meta/fields.yml diff --git a/metricbeat/module/system/_beat/config.yml b/metricbeat/module/system/_meta/config.yml similarity index 100% rename from metricbeat/module/system/_beat/config.yml rename to metricbeat/module/system/_meta/config.yml diff --git a/metricbeat/module/system/_beat/docs.asciidoc b/metricbeat/module/system/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/_beat/docs.asciidoc rename to metricbeat/module/system/_meta/docs.asciidoc diff --git a/metricbeat/module/system/_beat/fields.yml b/metricbeat/module/system/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/_beat/fields.yml rename to metricbeat/module/system/_meta/fields.yml diff --git a/metricbeat/module/system/_beat/kibana/dashboard/Metricbeat-System-Statistics.json b/metricbeat/module/system/_meta/kibana/dashboard/Metricbeat-System-Statistics.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/dashboard/Metricbeat-System-Statistics.json rename to metricbeat/module/system/_meta/kibana/dashboard/Metricbeat-System-Statistics.json diff --git a/metricbeat/module/system/_beat/kibana/index-pattern/metricbeat.json b/metricbeat/module/system/_meta/kibana/index-pattern/metricbeat.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/index-pattern/metricbeat.json rename to metricbeat/module/system/_meta/kibana/index-pattern/metricbeat.json diff --git a/metricbeat/module/system/_beat/kibana/search/Cpu-stats.json b/metricbeat/module/system/_meta/kibana/search/Cpu-stats.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/search/Cpu-stats.json rename to metricbeat/module/system/_meta/kibana/search/Cpu-stats.json diff --git a/metricbeat/module/system/_beat/kibana/search/Filesystem-stats.json b/metricbeat/module/system/_meta/kibana/search/Filesystem-stats.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/search/Filesystem-stats.json rename to metricbeat/module/system/_meta/kibana/search/Filesystem-stats.json diff --git a/metricbeat/module/system/_beat/kibana/search/Memory-search.json b/metricbeat/module/system/_meta/kibana/search/Memory-search.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/search/Memory-search.json rename to metricbeat/module/system/_meta/kibana/search/Memory-search.json diff --git a/metricbeat/module/system/_beat/kibana/search/Process-stats.json b/metricbeat/module/system/_meta/kibana/search/Process-stats.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/search/Process-stats.json rename to metricbeat/module/system/_meta/kibana/search/Process-stats.json diff --git a/metricbeat/module/system/_beat/kibana/search/System-stats.json b/metricbeat/module/system/_meta/kibana/search/System-stats.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/search/System-stats.json rename to metricbeat/module/system/_meta/kibana/search/System-stats.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/CPU-usage-per-process.json b/metricbeat/module/system/_meta/kibana/visualization/CPU-usage-per-process.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/CPU-usage-per-process.json rename to metricbeat/module/system/_meta/kibana/visualization/CPU-usage-per-process.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/CPU-usage.json b/metricbeat/module/system/_meta/kibana/visualization/CPU-usage.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/CPU-usage.json rename to metricbeat/module/system/_meta/kibana/visualization/CPU-usage.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/Disk-utilization-over-time.json b/metricbeat/module/system/_meta/kibana/visualization/Disk-utilization-over-time.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/Disk-utilization-over-time.json rename to metricbeat/module/system/_meta/kibana/visualization/Disk-utilization-over-time.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/Filesystem-overview.json b/metricbeat/module/system/_meta/kibana/visualization/Filesystem-overview.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/Filesystem-overview.json rename to metricbeat/module/system/_meta/kibana/visualization/Filesystem-overview.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/Memory-usage-per-process.json b/metricbeat/module/system/_meta/kibana/visualization/Memory-usage-per-process.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/Memory-usage-per-process.json rename to metricbeat/module/system/_meta/kibana/visualization/Memory-usage-per-process.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/Memory-usage.json b/metricbeat/module/system/_meta/kibana/visualization/Memory-usage.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/Memory-usage.json rename to metricbeat/module/system/_meta/kibana/visualization/Memory-usage.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/Servers-overview.json b/metricbeat/module/system/_meta/kibana/visualization/Servers-overview.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/Servers-overview.json rename to metricbeat/module/system/_meta/kibana/visualization/Servers-overview.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/System-load.json b/metricbeat/module/system/_meta/kibana/visualization/System-load.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/System-load.json rename to metricbeat/module/system/_meta/kibana/visualization/System-load.json diff --git a/metricbeat/module/system/_beat/kibana/visualization/Top-processes.json b/metricbeat/module/system/_meta/kibana/visualization/Top-processes.json similarity index 100% rename from metricbeat/module/system/_beat/kibana/visualization/Top-processes.json rename to metricbeat/module/system/_meta/kibana/visualization/Top-processes.json diff --git a/metricbeat/module/system/core/_beat/data.json b/metricbeat/module/system/core/_meta/data.json similarity index 100% rename from metricbeat/module/system/core/_beat/data.json rename to metricbeat/module/system/core/_meta/data.json diff --git a/metricbeat/module/system/core/_beat/docs.asciidoc b/metricbeat/module/system/core/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/core/_beat/docs.asciidoc rename to metricbeat/module/system/core/_meta/docs.asciidoc diff --git a/metricbeat/module/system/core/_beat/fields.yml b/metricbeat/module/system/core/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/core/_beat/fields.yml rename to metricbeat/module/system/core/_meta/fields.yml diff --git a/metricbeat/module/system/cpu/_beat/data.json b/metricbeat/module/system/cpu/_meta/data.json similarity index 100% rename from metricbeat/module/system/cpu/_beat/data.json rename to metricbeat/module/system/cpu/_meta/data.json diff --git a/metricbeat/module/system/cpu/_beat/docs.asciidoc b/metricbeat/module/system/cpu/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/cpu/_beat/docs.asciidoc rename to metricbeat/module/system/cpu/_meta/docs.asciidoc diff --git a/metricbeat/module/system/cpu/_beat/fields.yml b/metricbeat/module/system/cpu/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/cpu/_beat/fields.yml rename to metricbeat/module/system/cpu/_meta/fields.yml diff --git a/metricbeat/module/system/diskio/_beat/data.json b/metricbeat/module/system/diskio/_meta/data.json similarity index 100% rename from metricbeat/module/system/diskio/_beat/data.json rename to metricbeat/module/system/diskio/_meta/data.json diff --git a/metricbeat/module/system/diskio/_beat/docs.asciidoc b/metricbeat/module/system/diskio/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/diskio/_beat/docs.asciidoc rename to metricbeat/module/system/diskio/_meta/docs.asciidoc diff --git a/metricbeat/module/system/diskio/_beat/fields.yml b/metricbeat/module/system/diskio/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/diskio/_beat/fields.yml rename to metricbeat/module/system/diskio/_meta/fields.yml diff --git a/metricbeat/module/system/filesystem/_beat/data.json b/metricbeat/module/system/filesystem/_meta/data.json similarity index 100% rename from metricbeat/module/system/filesystem/_beat/data.json rename to metricbeat/module/system/filesystem/_meta/data.json diff --git a/metricbeat/module/system/filesystem/_beat/docs.asciidoc b/metricbeat/module/system/filesystem/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/filesystem/_beat/docs.asciidoc rename to metricbeat/module/system/filesystem/_meta/docs.asciidoc diff --git a/metricbeat/module/system/filesystem/_beat/fields.yml b/metricbeat/module/system/filesystem/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/filesystem/_beat/fields.yml rename to metricbeat/module/system/filesystem/_meta/fields.yml diff --git a/metricbeat/module/system/fsstat/_beat/data.json b/metricbeat/module/system/fsstat/_meta/data.json similarity index 100% rename from metricbeat/module/system/fsstat/_beat/data.json rename to metricbeat/module/system/fsstat/_meta/data.json diff --git a/metricbeat/module/system/fsstat/_beat/docs.asciidoc b/metricbeat/module/system/fsstat/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/fsstat/_beat/docs.asciidoc rename to metricbeat/module/system/fsstat/_meta/docs.asciidoc diff --git a/metricbeat/module/system/fsstat/_beat/fields.yml b/metricbeat/module/system/fsstat/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/fsstat/_beat/fields.yml rename to metricbeat/module/system/fsstat/_meta/fields.yml diff --git a/metricbeat/module/system/memory/_beat/data.json b/metricbeat/module/system/memory/_meta/data.json similarity index 100% rename from metricbeat/module/system/memory/_beat/data.json rename to metricbeat/module/system/memory/_meta/data.json diff --git a/metricbeat/module/system/memory/_beat/docs.asciidoc b/metricbeat/module/system/memory/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/memory/_beat/docs.asciidoc rename to metricbeat/module/system/memory/_meta/docs.asciidoc diff --git a/metricbeat/module/system/memory/_beat/fields.yml b/metricbeat/module/system/memory/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/memory/_beat/fields.yml rename to metricbeat/module/system/memory/_meta/fields.yml diff --git a/metricbeat/module/system/network/_beat/data.json b/metricbeat/module/system/network/_meta/data.json similarity index 100% rename from metricbeat/module/system/network/_beat/data.json rename to metricbeat/module/system/network/_meta/data.json diff --git a/metricbeat/module/system/network/_beat/docs.asciidoc b/metricbeat/module/system/network/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/network/_beat/docs.asciidoc rename to metricbeat/module/system/network/_meta/docs.asciidoc diff --git a/metricbeat/module/system/network/_beat/fields.yml b/metricbeat/module/system/network/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/network/_beat/fields.yml rename to metricbeat/module/system/network/_meta/fields.yml diff --git a/metricbeat/module/system/process/_beat/data.json b/metricbeat/module/system/process/_meta/data.json similarity index 100% rename from metricbeat/module/system/process/_beat/data.json rename to metricbeat/module/system/process/_meta/data.json diff --git a/metricbeat/module/system/process/_beat/docs.asciidoc b/metricbeat/module/system/process/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/system/process/_beat/docs.asciidoc rename to metricbeat/module/system/process/_meta/docs.asciidoc diff --git a/metricbeat/module/system/process/_beat/fields.yml b/metricbeat/module/system/process/_meta/fields.yml similarity index 100% rename from metricbeat/module/system/process/_beat/fields.yml rename to metricbeat/module/system/process/_meta/fields.yml diff --git a/metricbeat/module/zookeeper/_beat/config.yml b/metricbeat/module/zookeeper/_meta/config.yml similarity index 100% rename from metricbeat/module/zookeeper/_beat/config.yml rename to metricbeat/module/zookeeper/_meta/config.yml diff --git a/metricbeat/module/zookeeper/_beat/docs.asciidoc b/metricbeat/module/zookeeper/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/zookeeper/_beat/docs.asciidoc rename to metricbeat/module/zookeeper/_meta/docs.asciidoc diff --git a/metricbeat/module/zookeeper/_beat/fields.yml b/metricbeat/module/zookeeper/_meta/fields.yml similarity index 100% rename from metricbeat/module/zookeeper/_beat/fields.yml rename to metricbeat/module/zookeeper/_meta/fields.yml diff --git a/metricbeat/module/zookeeper/mntr/_beat/data.json b/metricbeat/module/zookeeper/mntr/_meta/data.json similarity index 100% rename from metricbeat/module/zookeeper/mntr/_beat/data.json rename to metricbeat/module/zookeeper/mntr/_meta/data.json diff --git a/metricbeat/module/zookeeper/mntr/_beat/docs.asciidoc b/metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc similarity index 100% rename from metricbeat/module/zookeeper/mntr/_beat/docs.asciidoc rename to metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc diff --git a/metricbeat/module/zookeeper/mntr/_beat/fields.yml b/metricbeat/module/zookeeper/mntr/_meta/fields.yml similarity index 100% rename from metricbeat/module/zookeeper/mntr/_beat/fields.yml rename to metricbeat/module/zookeeper/mntr/_meta/fields.yml diff --git a/metricbeat/scripts/config_collector.py b/metricbeat/scripts/config_collector.py index cb6ddfc63d47..208a1bd2ed25 100644 --- a/metricbeat/scripts/config_collector.py +++ b/metricbeat/scripts/config_collector.py @@ -54,7 +54,7 @@ def collect(beat_path, full=False): # Iterate over all modules for module in modules: - beat_path = path + "/" + module + "/_beat" + beat_path = path + "/" + module + "/_meta" module_configs = beat_path + "/config.yml" diff --git a/metricbeat/scripts/create_metricset.py b/metricbeat/scripts/create_metricset.py index 31dd9d522ec9..2ad710d6adbf 100644 --- a/metricbeat/scripts/create_metricset.py +++ b/metricbeat/scripts/create_metricset.py @@ -9,7 +9,7 @@ def generate_metricset(base_path, metricbeat_path, module, metricset): generate_module(base_path, metricbeat_path, module, metricset) metricset_path = base_path + "/module/" + module + "/" + metricset - meta_path = metricset_path + "/_beat" + meta_path = metricset_path + "/_meta" if os.path.isdir(metricset_path): print "MericSet already exists. Skipping creating metricset " + metricset + ".\n" @@ -42,7 +42,7 @@ def generate_metricset(base_path, metricbeat_path, module, metricset): def generate_module(base_path, metricbeat_path, module, metricset): module_path = base_path + "/module/" + module - meta_path = module_path + "/_beat" + meta_path = module_path + "/_meta" if os.path.isdir(module_path): print "Module already exists. Skipping creating module " + module + ".\n" diff --git a/metricbeat/scripts/docs_collector.py b/metricbeat/scripts/docs_collector.py index 3a09fc8a4595..41a54925e0af 100644 --- a/metricbeat/scripts/docs_collector.py +++ b/metricbeat/scripts/docs_collector.py @@ -18,7 +18,7 @@ def collect(): # Iterate over all modules for module in os.listdir(base_dir): - module_doc = path + "/" + module + "/_beat/docs.asciidoc" + module_doc = path + "/" + module + "/_meta/docs.asciidoc" # Only check folders where fields.yml exists if os.path.isfile(module_doc) == False: @@ -33,7 +33,7 @@ def collect(): with file(module_doc) as f: module_file += f.read() - beat_path = path + "/" + module + "/_beat" + beat_path = path + "/" + module + "/_meta" # Load title from fields.yml with open(beat_path + "/fields.yml") as f: @@ -78,7 +78,7 @@ def collect(): # Iterate over all metricsets for metricset in os.listdir(base_dir + "/" + module): - metricset_docs = path + "/" + module + "/" + metricset + "/_beat/docs.asciidoc" + metricset_docs = path + "/" + module + "/" + metricset + "/_meta/docs.asciidoc" # Only check folders where fields.yml exists if os.path.isfile(metricset_docs) == False: @@ -96,7 +96,7 @@ def collect(): # Add reference to metricset file and include file metricset_file += reference + "\n" - metricset_file += 'include::../../../module/' + module + '/' + metricset + '/_beat/docs.asciidoc[]' + "\n" + metricset_file += 'include::../../../module/' + module + '/' + metricset + '/_meta/docs.asciidoc[]' + "\n" # TODO: This should point directly to the exported fields of the metricset, not the whole module metricset_file += """ @@ -108,7 +108,7 @@ def collect(): """ - data_file = path + "/" + module + "/" + metricset + "/_beat/data.json" + data_file = path + "/" + module + "/" + metricset + "/_meta/data.json" # Add data.json example json document if os.path.isfile(data_file) == True: @@ -117,7 +117,7 @@ def collect(): metricset_file += "[source,json]\n" metricset_file += "----\n" - metricset_file += "include::../../../module/" + module + "/" + metricset + "/_beat/data.json[]\n" + metricset_file += "include::../../../module/" + module + "/" + metricset + "/_meta/data.json[]\n" metricset_file += "----\n" # Write metricset docs diff --git a/metricbeat/scripts/fields_collector.py b/metricbeat/scripts/fields_collector.py index e55a11dfda1f..f4f73874990c 100644 --- a/metricbeat/scripts/fields_collector.py +++ b/metricbeat/scripts/fields_collector.py @@ -14,7 +14,7 @@ def collect(): # Iterate over all modules for module in os.listdir(base_dir): - module_fields = path + "/" + module + "/_beat/fields.yml" + module_fields = path + "/" + module + "/_meta/fields.yml" # Only check folders where fields.yml exists if os.path.isfile(module_fields) == False: @@ -29,7 +29,7 @@ def collect(): # Iterate over all metricsets for metricset in os.listdir(base_dir + "/" + module): - metricset_fields = path + "/" + module + "/" + metricset + "/_beat/fields.yml" + metricset_fields = path + "/" + module + "/" + metricset + "/_meta/fields.yml" # Only check folders where fields.yml exists if os.path.isfile(metricset_fields) == False: diff --git a/metricbeat/scripts/generate_imports.py b/metricbeat/scripts/generate_imports.py index 0a7e2b743b40..2de0dcac7421 100644 --- a/metricbeat/scripts/generate_imports.py +++ b/metricbeat/scripts/generate_imports.py @@ -24,14 +24,14 @@ def generate(go_beat_path): # Fetch all modules for module in os.listdir(base_dir): - if os.path.isfile(path + "/" + module) or module == "_beat": + if os.path.isfile(path + "/" + module) or module == "_meta": continue list_file += ' _ "' + go_beat_path + '/module/' + module + '"\n' # Fetch all metricsets for metricset in os.listdir(base_dir + "/" + module): - if os.path.isfile(base_dir + "/" + module + "/" + metricset) or metricset == "_beat" or metricset == "vendor": + if os.path.isfile(base_dir + "/" + module + "/" + metricset) or metricset == "_meta" or metricset == "vendor": continue list_file += ' _ "' + go_beat_path + '/module/' + module + '/' + metricset + '"\n'