From d9cfe448086599b8e2f9db28f45138c65d173f77 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 4 Jun 2021 15:46:29 +0800 Subject: [PATCH 1/7] apmpackage: remove version directory The version directory should be added when copying to package-storage, but it is not needed in this repo. The version is maintained in manifest.yml. --- apmpackage/apm/{0.3.0 => }/README.template.md | 0 .../apm/{0.3.0 => }/agent/input/template.yml.hbs | 0 apmpackage/apm/{0.3.0 => }/changelog.yml | 0 .../elasticsearch/ilm/default_policy.json | 0 .../ingest_pipeline/apm_error_grouping_name.json | 0 .../ingest_pipeline/apm_ingest_timestamp.json | 0 .../apm_metrics_dynamic_template.json | 0 .../ingest_pipeline/apm_remove_span_metadata.json | 0 .../ingest_pipeline/apm_user_agent.json | 0 .../elasticsearch/ingest_pipeline/apm_user_geo.json | 0 .../elasticsearch/ingest_pipeline/default.json | 0 .../data_stream/app_metrics/fields/base-fields.yml | 0 .../data_stream/app_metrics/fields/ecs.yml | 0 .../data_stream/app_metrics/fields/fields.yml | 0 .../data_stream/app_metrics/manifest.yml | 0 .../elasticsearch/ilm/default_policy.json | 0 .../ingest_pipeline/apm_error_grouping_name.json | 0 .../ingest_pipeline/apm_ingest_timestamp.json | 0 .../apm_metrics_dynamic_template.json | 0 .../ingest_pipeline/apm_remove_span_metadata.json | 0 .../ingest_pipeline/apm_user_agent.json | 0 .../elasticsearch/ingest_pipeline/apm_user_geo.json | 0 .../elasticsearch/ingest_pipeline/default.json | 0 .../data_stream/error_logs/fields/base-fields.yml | 0 .../data_stream/error_logs/fields/ecs.yml | 0 .../data_stream/error_logs/fields/fields.yml | 0 .../{0.3.0 => }/data_stream/error_logs/manifest.yml | 0 .../elasticsearch/ilm/default_policy.json | 0 .../ingest_pipeline/apm_error_grouping_name.json | 0 .../ingest_pipeline/apm_ingest_timestamp.json | 0 .../apm_metrics_dynamic_template.json | 0 .../ingest_pipeline/apm_remove_span_metadata.json | 0 .../ingest_pipeline/apm_user_agent.json | 0 .../elasticsearch/ingest_pipeline/apm_user_geo.json | 0 .../elasticsearch/ingest_pipeline/default.json | 0 .../internal_metrics/fields/base-fields.yml | 0 .../data_stream/internal_metrics/fields/ecs.yml | 0 .../data_stream/internal_metrics/fields/fields.yml | 0 .../data_stream/internal_metrics/manifest.yml | 0 .../elasticsearch/ilm/default_policy.json | 0 .../ingest_pipeline/apm_error_grouping_name.json | 0 .../ingest_pipeline/apm_ingest_timestamp.json | 0 .../apm_metrics_dynamic_template.json | 0 .../ingest_pipeline/apm_remove_span_metadata.json | 0 .../ingest_pipeline/apm_user_agent.json | 0 .../elasticsearch/ingest_pipeline/apm_user_geo.json | 0 .../elasticsearch/ingest_pipeline/default.json | 0 .../profile_metrics/fields/base-fields.yml | 0 .../data_stream/profile_metrics/fields/ecs.yml | 0 .../data_stream/profile_metrics/fields/fields.yml | 0 .../data_stream/profile_metrics/manifest.yml | 0 .../elasticsearch/ilm/default_policy.json | 0 .../elasticsearch/ingest_pipeline/default.json | 0 .../sampled_traces/fields/base-fields.yml | 0 .../data_stream/sampled_traces/fields/ecs.yml | 0 .../data_stream/sampled_traces/fields/fields.yml | 0 .../data_stream/sampled_traces/manifest.yml | 0 .../traces/elasticsearch/ilm/default_policy.json | 0 .../ingest_pipeline/apm_error_grouping_name.json | 0 .../ingest_pipeline/apm_ingest_timestamp.json | 0 .../apm_metrics_dynamic_template.json | 0 .../ingest_pipeline/apm_remove_span_metadata.json | 0 .../ingest_pipeline/apm_user_agent.json | 0 .../elasticsearch/ingest_pipeline/apm_user_geo.json | 0 .../elasticsearch/ingest_pipeline/default.json | 0 .../data_stream/traces/fields/base-fields.yml | 0 .../{0.3.0 => }/data_stream/traces/fields/ecs.yml | 0 .../data_stream/traces/fields/fields.yml | 0 .../apm/{0.3.0 => }/data_stream/traces/manifest.yml | 0 apmpackage/apm/{0.3.0 => }/docs/README.md | 0 .../{0.3.0 => }/img/apm-01-service-inventory.png | Bin .../apm/{0.3.0 => }/img/apm-02-service-overview.png | Bin apmpackage/apm/{0.3.0 => }/img/apm-03-trace.png | Bin .../apm/{0.3.0 => }/img/apm-04-service-map.png | Bin apmpackage/apm/{0.3.0 => }/img/logo_apm.svg | 0 apmpackage/apm/{0.3.0 => }/manifest.yml | 0 76 files changed, 0 insertions(+), 0 deletions(-) rename apmpackage/apm/{0.3.0 => }/README.template.md (100%) rename apmpackage/apm/{0.3.0 => }/agent/input/template.yml.hbs (100%) rename apmpackage/apm/{0.3.0 => }/changelog.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/elasticsearch/ilm/default_policy.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/fields/base-fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/fields/ecs.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/fields/fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/app_metrics/manifest.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/elasticsearch/ilm/default_policy.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_error_grouping_name.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_agent.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_geo.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/fields/base-fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/fields/ecs.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/fields/fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/error_logs/manifest.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/elasticsearch/ilm/default_policy.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/fields/base-fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/fields/ecs.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/fields/fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/internal_metrics/manifest.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/elasticsearch/ilm/default_policy.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/fields/base-fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/fields/ecs.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/fields/fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/profile_metrics/manifest.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/sampled_traces/elasticsearch/ilm/default_policy.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/sampled_traces/elasticsearch/ingest_pipeline/default.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/sampled_traces/fields/base-fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/sampled_traces/fields/ecs.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/sampled_traces/fields/fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/sampled_traces/manifest.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/elasticsearch/ilm/default_policy.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/elasticsearch/ingest_pipeline/apm_error_grouping_name.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_agent.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_geo.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/elasticsearch/ingest_pipeline/default.json (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/fields/base-fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/fields/ecs.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/fields/fields.yml (100%) rename apmpackage/apm/{0.3.0 => }/data_stream/traces/manifest.yml (100%) rename apmpackage/apm/{0.3.0 => }/docs/README.md (100%) rename apmpackage/apm/{0.3.0 => }/img/apm-01-service-inventory.png (100%) rename apmpackage/apm/{0.3.0 => }/img/apm-02-service-overview.png (100%) rename apmpackage/apm/{0.3.0 => }/img/apm-03-trace.png (100%) rename apmpackage/apm/{0.3.0 => }/img/apm-04-service-map.png (100%) rename apmpackage/apm/{0.3.0 => }/img/logo_apm.svg (100%) rename apmpackage/apm/{0.3.0 => }/manifest.yml (100%) diff --git a/apmpackage/apm/0.3.0/README.template.md b/apmpackage/apm/README.template.md similarity index 100% rename from apmpackage/apm/0.3.0/README.template.md rename to apmpackage/apm/README.template.md diff --git a/apmpackage/apm/0.3.0/agent/input/template.yml.hbs b/apmpackage/apm/agent/input/template.yml.hbs similarity index 100% rename from apmpackage/apm/0.3.0/agent/input/template.yml.hbs rename to apmpackage/apm/agent/input/template.yml.hbs diff --git a/apmpackage/apm/0.3.0/changelog.yml b/apmpackage/apm/changelog.yml similarity index 100% rename from apmpackage/apm/0.3.0/changelog.yml rename to apmpackage/apm/changelog.yml diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ilm/default_policy.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ilm/default_policy.json rename to apmpackage/apm/data_stream/app_metrics/elasticsearch/ilm/default_policy.json diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json rename to apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json rename to apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json rename to apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json rename to apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json rename to apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json rename to apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json rename to apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/fields/base-fields.yml b/apmpackage/apm/data_stream/app_metrics/fields/base-fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/fields/base-fields.yml rename to apmpackage/apm/data_stream/app_metrics/fields/base-fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/fields/ecs.yml b/apmpackage/apm/data_stream/app_metrics/fields/ecs.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/fields/ecs.yml rename to apmpackage/apm/data_stream/app_metrics/fields/ecs.yml diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/fields/fields.yml b/apmpackage/apm/data_stream/app_metrics/fields/fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/fields/fields.yml rename to apmpackage/apm/data_stream/app_metrics/fields/fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/app_metrics/manifest.yml b/apmpackage/apm/data_stream/app_metrics/manifest.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/app_metrics/manifest.yml rename to apmpackage/apm/data_stream/app_metrics/manifest.yml diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ilm/default_policy.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ilm/default_policy.json rename to apmpackage/apm/data_stream/error_logs/elasticsearch/ilm/default_policy.json diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_error_grouping_name.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_error_grouping_name.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_error_grouping_name.json rename to apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_error_grouping_name.json diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json rename to apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json rename to apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json rename to apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_agent.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_agent.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_agent.json rename to apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_agent.json diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_geo.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_geo.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_geo.json rename to apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_user_geo.json diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json rename to apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/fields/base-fields.yml b/apmpackage/apm/data_stream/error_logs/fields/base-fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/fields/base-fields.yml rename to apmpackage/apm/data_stream/error_logs/fields/base-fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/fields/ecs.yml b/apmpackage/apm/data_stream/error_logs/fields/ecs.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/fields/ecs.yml rename to apmpackage/apm/data_stream/error_logs/fields/ecs.yml diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/fields/fields.yml b/apmpackage/apm/data_stream/error_logs/fields/fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/fields/fields.yml rename to apmpackage/apm/data_stream/error_logs/fields/fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/error_logs/manifest.yml b/apmpackage/apm/data_stream/error_logs/manifest.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/error_logs/manifest.yml rename to apmpackage/apm/data_stream/error_logs/manifest.yml diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ilm/default_policy.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ilm/default_policy.json rename to apmpackage/apm/data_stream/internal_metrics/elasticsearch/ilm/default_policy.json diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json rename to apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json rename to apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json rename to apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json rename to apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json rename to apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json rename to apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json rename to apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/fields/base-fields.yml b/apmpackage/apm/data_stream/internal_metrics/fields/base-fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/fields/base-fields.yml rename to apmpackage/apm/data_stream/internal_metrics/fields/base-fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/fields/ecs.yml b/apmpackage/apm/data_stream/internal_metrics/fields/ecs.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/fields/ecs.yml rename to apmpackage/apm/data_stream/internal_metrics/fields/ecs.yml diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/fields/fields.yml b/apmpackage/apm/data_stream/internal_metrics/fields/fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/fields/fields.yml rename to apmpackage/apm/data_stream/internal_metrics/fields/fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/internal_metrics/manifest.yml b/apmpackage/apm/data_stream/internal_metrics/manifest.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/internal_metrics/manifest.yml rename to apmpackage/apm/data_stream/internal_metrics/manifest.yml diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ilm/default_policy.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ilm/default_policy.json rename to apmpackage/apm/data_stream/profile_metrics/elasticsearch/ilm/default_policy.json diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json rename to apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_error_grouping_name.json diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json rename to apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json rename to apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json rename to apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json rename to apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_agent.json diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json rename to apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_user_geo.json diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json rename to apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/fields/base-fields.yml b/apmpackage/apm/data_stream/profile_metrics/fields/base-fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/fields/base-fields.yml rename to apmpackage/apm/data_stream/profile_metrics/fields/base-fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/fields/ecs.yml b/apmpackage/apm/data_stream/profile_metrics/fields/ecs.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/fields/ecs.yml rename to apmpackage/apm/data_stream/profile_metrics/fields/ecs.yml diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/fields/fields.yml b/apmpackage/apm/data_stream/profile_metrics/fields/fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/fields/fields.yml rename to apmpackage/apm/data_stream/profile_metrics/fields/fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/profile_metrics/manifest.yml b/apmpackage/apm/data_stream/profile_metrics/manifest.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/profile_metrics/manifest.yml rename to apmpackage/apm/data_stream/profile_metrics/manifest.yml diff --git a/apmpackage/apm/0.3.0/data_stream/sampled_traces/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/sampled_traces/elasticsearch/ilm/default_policy.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/sampled_traces/elasticsearch/ilm/default_policy.json rename to apmpackage/apm/data_stream/sampled_traces/elasticsearch/ilm/default_policy.json diff --git a/apmpackage/apm/0.3.0/data_stream/sampled_traces/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/sampled_traces/elasticsearch/ingest_pipeline/default.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/sampled_traces/elasticsearch/ingest_pipeline/default.json rename to apmpackage/apm/data_stream/sampled_traces/elasticsearch/ingest_pipeline/default.json diff --git a/apmpackage/apm/0.3.0/data_stream/sampled_traces/fields/base-fields.yml b/apmpackage/apm/data_stream/sampled_traces/fields/base-fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/sampled_traces/fields/base-fields.yml rename to apmpackage/apm/data_stream/sampled_traces/fields/base-fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/sampled_traces/fields/ecs.yml b/apmpackage/apm/data_stream/sampled_traces/fields/ecs.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/sampled_traces/fields/ecs.yml rename to apmpackage/apm/data_stream/sampled_traces/fields/ecs.yml diff --git a/apmpackage/apm/0.3.0/data_stream/sampled_traces/fields/fields.yml b/apmpackage/apm/data_stream/sampled_traces/fields/fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/sampled_traces/fields/fields.yml rename to apmpackage/apm/data_stream/sampled_traces/fields/fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/sampled_traces/manifest.yml b/apmpackage/apm/data_stream/sampled_traces/manifest.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/sampled_traces/manifest.yml rename to apmpackage/apm/data_stream/sampled_traces/manifest.yml diff --git a/apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/traces/elasticsearch/ilm/default_policy.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ilm/default_policy.json rename to apmpackage/apm/data_stream/traces/elasticsearch/ilm/default_policy.json diff --git a/apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_error_grouping_name.json b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_error_grouping_name.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_error_grouping_name.json rename to apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_error_grouping_name.json diff --git a/apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json rename to apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_ingest_timestamp.json diff --git a/apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json rename to apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json diff --git a/apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json rename to apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_remove_span_metadata.json diff --git a/apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_agent.json b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_agent.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_agent.json rename to apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_agent.json diff --git a/apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_geo.json b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_geo.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_geo.json rename to apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_user_geo.json diff --git a/apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/default.json b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/default.json similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/elasticsearch/ingest_pipeline/default.json rename to apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/default.json diff --git a/apmpackage/apm/0.3.0/data_stream/traces/fields/base-fields.yml b/apmpackage/apm/data_stream/traces/fields/base-fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/fields/base-fields.yml rename to apmpackage/apm/data_stream/traces/fields/base-fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/traces/fields/ecs.yml b/apmpackage/apm/data_stream/traces/fields/ecs.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/fields/ecs.yml rename to apmpackage/apm/data_stream/traces/fields/ecs.yml diff --git a/apmpackage/apm/0.3.0/data_stream/traces/fields/fields.yml b/apmpackage/apm/data_stream/traces/fields/fields.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/fields/fields.yml rename to apmpackage/apm/data_stream/traces/fields/fields.yml diff --git a/apmpackage/apm/0.3.0/data_stream/traces/manifest.yml b/apmpackage/apm/data_stream/traces/manifest.yml similarity index 100% rename from apmpackage/apm/0.3.0/data_stream/traces/manifest.yml rename to apmpackage/apm/data_stream/traces/manifest.yml diff --git a/apmpackage/apm/0.3.0/docs/README.md b/apmpackage/apm/docs/README.md similarity index 100% rename from apmpackage/apm/0.3.0/docs/README.md rename to apmpackage/apm/docs/README.md diff --git a/apmpackage/apm/0.3.0/img/apm-01-service-inventory.png b/apmpackage/apm/img/apm-01-service-inventory.png similarity index 100% rename from apmpackage/apm/0.3.0/img/apm-01-service-inventory.png rename to apmpackage/apm/img/apm-01-service-inventory.png diff --git a/apmpackage/apm/0.3.0/img/apm-02-service-overview.png b/apmpackage/apm/img/apm-02-service-overview.png similarity index 100% rename from apmpackage/apm/0.3.0/img/apm-02-service-overview.png rename to apmpackage/apm/img/apm-02-service-overview.png diff --git a/apmpackage/apm/0.3.0/img/apm-03-trace.png b/apmpackage/apm/img/apm-03-trace.png similarity index 100% rename from apmpackage/apm/0.3.0/img/apm-03-trace.png rename to apmpackage/apm/img/apm-03-trace.png diff --git a/apmpackage/apm/0.3.0/img/apm-04-service-map.png b/apmpackage/apm/img/apm-04-service-map.png similarity index 100% rename from apmpackage/apm/0.3.0/img/apm-04-service-map.png rename to apmpackage/apm/img/apm-04-service-map.png diff --git a/apmpackage/apm/0.3.0/img/logo_apm.svg b/apmpackage/apm/img/logo_apm.svg similarity index 100% rename from apmpackage/apm/0.3.0/img/logo_apm.svg rename to apmpackage/apm/img/logo_apm.svg diff --git a/apmpackage/apm/0.3.0/manifest.yml b/apmpackage/apm/manifest.yml similarity index 100% rename from apmpackage/apm/0.3.0/manifest.yml rename to apmpackage/apm/manifest.yml From 56ea48a39c623caa5da1fa86ad1fe25168470ade Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 4 Jun 2021 15:51:33 +0800 Subject: [PATCH 2/7] apmpackage: update package version to 0.3.0 --- apmpackage/apm/changelog.yml | 16 +++++++++++++--- apmpackage/apm/manifest.yml | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/apmpackage/apm/changelog.yml b/apmpackage/apm/changelog.yml index 403dbc0c8ba..a8a9f912d30 100644 --- a/apmpackage/apm/changelog.yml +++ b/apmpackage/apm/changelog.yml @@ -1,14 +1,24 @@ # newer versions go on top +# +# change type can be one of: enhancement, bugfix, breaking-change +- version: "0.3.0" + changes: + - description: added apm-server.url config + type: enhancement + link: https://github.com/elastic/apm-server/pull/5332 + - description: removed apm-server.kibana.api_key config + type: enhancement + link: https://github.com/elastic/apm-server/pull/5380 - version: "0.2.0" changes: - description: added support for apm-server.rum.allow_service_names - type: enhancement # can be one of: enhancement, bugfix, breaking-change + type: enhancement link: https://github.com/elastic/apm-server/pull/5030 - description: introduce a configurable default service environment - type: enhancement # can be one of: enhancement, bugfix, breaking-change + type: enhancement link: https://github.com/elastic/apm-server/pull/4861 - version: "0.1.0" changes: - description: initial release - type: enhancement # can be one of: enhancement, bugfix, breaking-change + type: enhancement link: https://github.com/elastic/apm-server/ diff --git a/apmpackage/apm/manifest.yml b/apmpackage/apm/manifest.yml index a9fe2a411ba..bed61c422ee 100644 --- a/apmpackage/apm/manifest.yml +++ b/apmpackage/apm/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: apm title: Elastic APM -version: 0.2.0 +version: 0.3.0 license: basic description: Ingest APM data type: integration From eac87520cba4a5e6b1bd88c162d632072ee8e9a9 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 4 Jun 2021 16:13:25 +0800 Subject: [PATCH 3/7] Update apmpackage instructions and script --- apmpackage/README.md | 10 +++++----- script/copy_package.py | 19 ++++++++----------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/apmpackage/README.md b/apmpackage/README.md index 9209c67a7a7..05d8bcae103 100644 --- a/apmpackage/README.md +++ b/apmpackage/README.md @@ -10,12 +10,12 @@ #### Update / fix a package 1. Actual work - - Make changes in `apmpackage/apm/` and/or code as needed + - Make changes in `apmpackage/apm` and/or code as needed - Run `make update`. That will update fields, pipeline and doc files based on apm-server fields and pipeline defs. 2. Run the registry - Checkout a fresh master from the registry and run `mage build` - - Copy `apmpackage/apm` in apm-server to `build/package-storage/packages` in the registry + - Copy `apmpackage/apm` in apm-server to `build/package-storage/packages/apm/` in the registry - `go run .` 3. Run the stack @@ -34,17 +34,17 @@ 5. Upload to the snapshot registry - When everything works and `apmpackage/apm/` changes have been merged to `master`, copy the new package to - `package-storage/packages` in the `package-storage` repo, `snapshot` branch. + `package-storage/packages/apm/` in the `package-storage` repo, `snapshot` branch. Do *NOT* override any existing packages. Instead, bump the qualifier version (eg: `0.1.0-dev.1` to `0.1.0-dev.2`) both in the folder name and the content (`manifest.yml` and `default.json` pipelines) - - You can `cd script && python copy-package.py` for this. + - You can `cd script && python copy_package.py` for this. #### Create a new package version Follow steps described above, except: 1. New local version - - Copy `apmpackage/apm/` to `apmpackage/apm/`. + - Bump the version in `apmpackage/apm/manifest.yml` - Add a new version mapping in the `versionMapping` variable at the top of `apmpackage/cmd/gen-package/main.go`. Most likely this won't be needed in the future. - Then do any changes in the new folder. The rest of the steps are the same. diff --git a/script/copy_package.py b/script/copy_package.py index cd70ca09c2a..ed9b7103bcd 100644 --- a/script/copy_package.py +++ b/script/copy_package.py @@ -6,6 +6,7 @@ import subprocess import sys +import yaml def semver_sorter(a, b): a_list = a.split("-") @@ -38,22 +39,18 @@ def bump(v): parser = argparse.ArgumentParser() parser.add_argument('--dst', help='directory of the package-storage repo', default="../../package-storage") parser.add_argument('--final', action='store_true') - parser.add_argument('-v', '--version', help='version of the package to copy, defaults to last one') parser.add_argument('--dry', action='store_true', help='dont copy data') args = parser.parse_args() src = "../apmpackage/apm/" - original_version = args.version - if not args.version: - # default to last version - versions = [os.path.basename(f) for f in os.listdir(src)] - versions.sort() - original_version = versions[-1] - - src = os.path.join(src, original_version) - dst = os.path.join(args.dst, "packages/apm/") + + # Get the version from manifest.yml + with open(src + 'manifest.yml', 'r') as f: + manifest = yaml.safe_load(f) + original_version = manifest['version'] # find and sort published versions + dst = os.path.join(args.dst, "packages/apm/") published_versions = [os.path.basename(f) for f in os.listdir(dst)] published_versions.sort(key=cmp_to_key(semver_sorter)) published_versions.reverse() @@ -84,7 +81,7 @@ def bump(v): # copy over the package and replace version in manifest and pipeline names shutil.copytree(src, dst) subprocess.check_call('rm -rf {0}'.format(os.path.join(dst, 'README.template.md')), shell=True) - cmd = 'find {0} -not -name "*.png" -type f -print0 | xargs -0 sed -i "" "s/{1}/{2}/g"'.format( + cmd = 'find {0} -not -name "*.png" -type f -exec sed -i -e "s/{1}/{2}/g" {{}} \\;'.format( dst, original_version, next_version) out = subprocess.check_output(cmd, shell=True) From 0bb100102aab4212075407a9d675b7440d9cff86 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 4 Jun 2021 16:16:33 +0800 Subject: [PATCH 4/7] Makefile: update *-package targets --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 73cdb39baab..a8f267800bc 100644 --- a/Makefile +++ b/Makefile @@ -238,11 +238,11 @@ check-docker-compose: $(PYTHON_BIN) .PHONY: check-package format-package build-package check-package: $(ELASTICPACKAGE) - @for x in apmpackage/apm/*; do (cd $$x; echo "Checking $$x"; $(CURDIR)/$(ELASTICPACKAGE) check); done + @(cd apmpackage/apm; $(CURDIR)/$(ELASTICPACKAGE) check) format-package: $(ELASTICPACKAGE) - @for x in apmpackage/apm/*; do (cd $$x; echo "Formatting $$x"; $(CURDIR)/$(ELASTICPACKAGE) format); done + @(cd apmpackage/apm; $(CURDIR)/$(ELASTICPACKAGE) format) build-package: $(ELASTICPACKAGE) - @for x in apmpackage/apm/*; do (cd $$x; echo "Building $$x"; $(CURDIR)/$(ELASTICPACKAGE) build); done + @(cd apmpackage/apm; $(CURDIR)/$(ELASTICPACKAGE) build) .PHONY: check-gofmt check-autopep8 gofmt autopep8 check-fmt: check-gofmt check-autopep8 From 4c55429846f13a0f9df13112f199992b9e6d867c Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 4 Jun 2021 17:06:07 +0800 Subject: [PATCH 5/7] add docker entrypoint to copy package to am/n.n.n --- docker-compose.yml | 4 +++- testing/docker/package-registry/entrypoint.sh | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 testing/docker/package-registry/entrypoint.sh diff --git a/docker-compose.yml b/docker-compose.yml index 18694a2a4a8..8cfd9a14f93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,6 +108,8 @@ services: image: docker.elastic.co/package-registry/distribution:snapshot ports: - 8080 + entrypoint: /entrypoint.sh volumes: + - "./testing/docker/package-registry/entrypoint.sh:/entrypoint.sh" - "./testing/docker/package-registry/config.yml:/package-registry/config.yml" - - "./apmpackage/apm:/packages/local/apm" + - "./apmpackage:/apmpackage" # copied to /packages/local/apm/ by entrypoint.sh diff --git a/testing/docker/package-registry/entrypoint.sh b/testing/docker/package-registry/entrypoint.sh new file mode 100755 index 00000000000..a04457b054e --- /dev/null +++ b/testing/docker/package-registry/entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -e + +# Copy the package into the expected directory structure, using the version +# defined in manifest.yml. Packages must be stored in "/", +# and the version directory must match the version defined in manifest.yml. + +VERSION=$(grep '^version:' /apmpackage/apm/manifest.yml | cut -d ' ' -f 2) +PACKAGES_LOCAL_APM=/packages/local/apm + +rm -fr $PACKAGES_LOCAL_APM +mkdir -p $PACKAGES_LOCAL_APM +cp -r /apmpackage/apm/ $PACKAGES_LOCAL_APM/$VERSION + +exec ./package-registry --address=0.0.0.0:8080 From cf586e62de63275eea53e24f534440163044b1fa Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 4 Jun 2021 19:56:14 +0800 Subject: [PATCH 6/7] apmpackage/cmd/gen-package: no version in path --- apmpackage/README.md | 2 - apmpackage/cmd/gen-package/gendocs.go | 18 ++++---- apmpackage/cmd/gen-package/genfields.go | 4 +- apmpackage/cmd/gen-package/genpipelines.go | 6 +-- apmpackage/cmd/gen-package/main.go | 52 +++++++++------------- apmpackage/cmd/gen-package/paths.go | 36 ++++++++------- 6 files changed, 56 insertions(+), 62 deletions(-) diff --git a/apmpackage/README.md b/apmpackage/README.md index 05d8bcae103..52559087d17 100644 --- a/apmpackage/README.md +++ b/apmpackage/README.md @@ -45,8 +45,6 @@ Follow steps described above, except: 1. New local version - Bump the version in `apmpackage/apm/manifest.yml` - - Add a new version mapping in the `versionMapping` variable at the top of `apmpackage/cmd/gen-package/main.go`. - Most likely this won't be needed in the future. - Then do any changes in the new folder. The rest of the steps are the same. 2. First dev version diff --git a/apmpackage/cmd/gen-package/gendocs.go b/apmpackage/cmd/gen-package/gendocs.go index ba20945eb44..ebcb159cf2b 100644 --- a/apmpackage/cmd/gen-package/gendocs.go +++ b/apmpackage/cmd/gen-package/gendocs.go @@ -37,25 +37,25 @@ func escapeReplacer(s ...string) *strings.Replacer { var markdownReplacer = escapeReplacer("\\", "`", "*", "_") -func generateDocs(inputFields map[string][]field, version string) { +func generateDocs(inputFields map[string][]field) { data := docsData{ - Traces: prepareFields(inputFields, version, "traces"), - Metrics: prepareFields(inputFields, version, "app_metrics"), - Logs: prepareFields(inputFields, version, "error_logs"), + Traces: prepareFields(inputFields, "traces"), + Metrics: prepareFields(inputFields, "app_metrics"), + Logs: prepareFields(inputFields, "error_logs"), TransactionExample: loadExample("transactions.json"), SpanExample: loadExample("spans.json"), MetricsExample: loadExample("metricsets.json"), ErrorExample: loadExample("errors.json"), } - t := template.New(docsTemplateFilePath(version)) + t := template.New(docsTemplateFilePath()) tmpl, err := t.Funcs(map[string]interface{}{ "Trim": strings.TrimSpace, "EscapeMarkdown": markdownReplacer.Replace, - }).ParseFiles(docsTemplateFilePath(version)) + }).ParseFiles(docsTemplateFilePath()) if err != nil { panic(err) } - path := docsFilePath(version) + path := docsFilePath() file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) if err != nil { panic(err) @@ -77,10 +77,10 @@ type docsData struct { ErrorExample string } -func prepareFields(inputFields map[string][]field, version, stream string) []field { +func prepareFields(inputFields map[string][]field, stream string) []field { extend := func(fs []field) []field { var baseFields []field - for _, f := range loadFieldsFile(baseFieldsFilePath(version, stream)) { + for _, f := range loadFieldsFile(baseFieldsFilePath(stream)) { f.IsECS = true baseFields = append(baseFields, f) } diff --git a/apmpackage/cmd/gen-package/genfields.go b/apmpackage/cmd/gen-package/genfields.go index d5828923c87..012f518737f 100644 --- a/apmpackage/cmd/gen-package/genfields.go +++ b/apmpackage/cmd/gen-package/genfields.go @@ -30,7 +30,7 @@ import ( "github.com/elastic/ecs/code/go/ecs" ) -func generateFields(version string) map[string][]field { +func generateFields() map[string][]field { ecsFlatFields := loadECSFields() @@ -60,7 +60,7 @@ func generateFields(version string) map[string][]field { if err != nil { panic(err) } - err = ioutil.WriteFile(filepath.Join(fieldsPath(version, streamType), fName), bytes, 0644) + err = ioutil.WriteFile(filepath.Join(fieldsPath(streamType), fName), bytes, 0644) if err != nil { panic(err) } diff --git a/apmpackage/cmd/gen-package/genpipelines.go b/apmpackage/cmd/gen-package/genpipelines.go index 322afae1368..2eed1a9307a 100644 --- a/apmpackage/cmd/gen-package/genpipelines.go +++ b/apmpackage/cmd/gen-package/genpipelines.go @@ -61,7 +61,7 @@ func generatePipelines(version, dataStream string) error { return err } - if err := os.MkdirAll(pipelinesPath(version, dataStream), 0755); err != nil { + if err := os.MkdirAll(pipelinesPath(dataStream), 0755); err != nil { return err } @@ -71,7 +71,7 @@ func generatePipelines(version, dataStream string) error { apmPipelineBody = definition.Body continue } - fName := filepath.Join(pipelinesPath(version, dataStream), definition.ID+".json") + fName := filepath.Join(pipelinesPath(dataStream), definition.ID+".json") if err := writeFilePipelineJSON(fName, definition.Body); err != nil { return err } @@ -91,7 +91,7 @@ func generatePipelines(version, dataStream string) error { } apmPipelineBody = out } - fName := filepath.Join(pipelinesPath(version, dataStream), "default.json") + fName := filepath.Join(pipelinesPath(dataStream), "default.json") return writeFilePipelineJSON(fName, apmPipelineBody) } diff --git a/apmpackage/cmd/gen-package/main.go b/apmpackage/cmd/gen-package/main.go index 1afed3bd6e5..c2378cc748e 100644 --- a/apmpackage/cmd/gen-package/main.go +++ b/apmpackage/cmd/gen-package/main.go @@ -18,24 +18,13 @@ package main import ( - "errors" - "fmt" "io/ioutil" "log" "os" - "github.com/elastic/apm-server/cmd" - "github.com/elastic/beats/v7/libbeat/common" + "gopkg.in/yaml.v2" ) -var versionMapping = map[string]string{ - "7.11": "0.1.0", - "7.12": "0.1.0", - "7.13": "0.2.0", - "7.14": "0.3.0", - "8.0": "0.3.0", -} - // Some data streams may not have a counterpart template // in standalone apm-server, and so it does not make sense // to maintain a separate fields.yml. @@ -44,29 +33,32 @@ var handwritten = map[string]bool{ } func main() { - stackVersion := common.MustNewVersion(cmd.DefaultSettings().Version) - shortVersion := fmt.Sprintf("%d.%d", stackVersion.Major, stackVersion.Minor) - packageVersion, ok := versionMapping[shortVersion] - if !ok { - panic(errors.New("package can't be generated for current apm-server version")) + manifestData, err := ioutil.ReadFile(manifestFilePath()) + if err != nil { + log.Fatal(err) } - clear(packageVersion) - inputFields := generateFields(packageVersion) + var manifest struct { + Version string `yaml:"version"` + } + if err := yaml.Unmarshal(manifestData, &manifest); err != nil { + log.Fatal(err) + } + + clear() + inputFields := generateFields() for dataStream := range inputFields { - if err := generatePipelines(packageVersion, dataStream); err != nil { + if err := generatePipelines(manifest.Version, dataStream); err != nil { log.Fatal(err) } } // TODO(axw) rely on `elastic-package build` to build docs from a template, like in integrations. - generateDocs(inputFields, packageVersion) - log.Printf("Package fields and docs generated for version %s (stack %s)", packageVersion, stackVersion.String()) + generateDocs(inputFields) + log.Printf("Package fields and docs generated for version %s", manifest.Version) } -func clear(version string) { - fileInfo, err := ioutil.ReadDir(dataStreamPath(version)) +func clear() { + fileInfo, err := ioutil.ReadDir(dataStreamPath()) if err != nil { - log.Printf("NOTE: if you are adding a new package version, you must create the folder"+ - " `apmpackage/apm/%s/` and copy all the contents from the previous version.", version) panic(err) } for _, f := range fileInfo { @@ -77,11 +69,11 @@ func clear(version string) { if handwritten[name] { continue } - removeFile(ecsFilePath(version, name)) - removeFile(fieldsFilePath(version, name)) - removeDir(pipelinesPath(version, name)) + removeFile(ecsFilePath(name)) + removeFile(fieldsFilePath(name)) + removeDir(pipelinesPath(name)) } - ioutil.WriteFile(docsFilePath(version), nil, 0644) + ioutil.WriteFile(docsFilePath(), nil, 0644) } func removeFile(path string) { diff --git a/apmpackage/cmd/gen-package/paths.go b/apmpackage/cmd/gen-package/paths.go index 00bd198fbf9..70b7b210102 100644 --- a/apmpackage/cmd/gen-package/paths.go +++ b/apmpackage/cmd/gen-package/paths.go @@ -19,34 +19,38 @@ package main import "path/filepath" -func docsTemplateFilePath(version string) string { - return filepath.Join("apmpackage", "apm", version, "README.template.md") +func manifestFilePath() string { + return filepath.Join("apmpackage", "apm", "manifest.yml") } -func docsFilePath(version string) string { - return filepath.Join("apmpackage", "apm", version, "docs/README.md") +func docsTemplateFilePath() string { + return filepath.Join("apmpackage", "apm", "README.template.md") } -func pipelinesPath(version, dataStream string) string { - return filepath.Join("apmpackage", "apm", version, "data_stream", dataStream, "elasticsearch", "ingest_pipeline") +func docsFilePath() string { + return filepath.Join("apmpackage", "apm", "docs/README.md") } -func dataStreamPath(version string) string { - return filepath.Join("apmpackage", "apm", version, "data_stream") +func pipelinesPath(dataStream string) string { + return filepath.Join("apmpackage", "apm", "data_stream", dataStream, "elasticsearch", "ingest_pipeline") } -func fieldsPath(version, dataStream string) string { - return filepath.Join(dataStreamPath(version), dataStream, "fields") +func dataStreamPath() string { + return filepath.Join("apmpackage", "apm", "data_stream") } -func ecsFilePath(version, dataStream string) string { - return filepath.Join(fieldsPath(version, dataStream), "ecs.yml") +func fieldsPath(dataStream string) string { + return filepath.Join(dataStreamPath(), dataStream, "fields") } -func fieldsFilePath(version, dataStream string) string { - return filepath.Join(fieldsPath(version, dataStream), "fields.yml") +func ecsFilePath(dataStream string) string { + return filepath.Join(fieldsPath(dataStream), "ecs.yml") } -func baseFieldsFilePath(version, dataStream string) string { - return filepath.Join(fieldsPath(version, dataStream), "base-fields.yml") +func fieldsFilePath(dataStream string) string { + return filepath.Join(fieldsPath(dataStream), "fields.yml") +} + +func baseFieldsFilePath(dataStream string) string { + return filepath.Join(fieldsPath(dataStream), "base-fields.yml") } From 06d14df093de76ac61859b6660be427ec5e16823 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 4 Jun 2021 20:17:26 +0800 Subject: [PATCH 7/7] make fmt --- script/copy_package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/script/copy_package.py b/script/copy_package.py index ed9b7103bcd..51054d00a3a 100644 --- a/script/copy_package.py +++ b/script/copy_package.py @@ -8,6 +8,7 @@ import yaml + def semver_sorter(a, b): a_list = a.split("-") b_list = b.split("-")