Reapply paths after merge

danielmitterdorfer · Jul 24, 2023 · 82336e3 · 82336e3
1 parent 89f9b62
commit 82336e3
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 21 deletions.
diff --git a/.../component-template/profiling-events.json → .../component-template/profiling-events.json b/.../component-template/profiling-events.json → .../component-template/profiling-events.json
diff --git a/...onent-template/profiling-executables.json → ...onent-template/profiling-executables.json b/...onent-template/profiling-executables.json → ...onent-template/profiling-executables.json
diff --git a/...r/component-template/profiling-hosts.json → ...g/component-template/profiling-hosts.json b/...r/component-template/profiling-hosts.json → ...g/component-template/profiling-hosts.json
diff --git a/...omponent-template/profiling-hot-tier.json → ...omponent-template/profiling-hot-tier.json b/...omponent-template/profiling-hot-tier.json → ...omponent-template/profiling-hot-tier.json
diff --git a/...ler/component-template/profiling-ilm.json → ...ing/component-template/profiling-ilm.json b/...ler/component-template/profiling-ilm.json → ...ing/component-template/profiling-ilm.json
diff --git a/...component-template/profiling-metrics.json → ...component-template/profiling-metrics.json b/...component-template/profiling-metrics.json → ...component-template/profiling-metrics.json
diff --git a/...onent-template/profiling-stackframes.json → ...onent-template/profiling-stackframes.json b/...onent-template/profiling-stackframes.json → ...onent-template/profiling-stackframes.json
diff --git a/...onent-template/profiling-stacktraces.json → ...onent-template/profiling-stacktraces.json b/...onent-template/profiling-stacktraces.json → ...onent-template/profiling-stacktraces.json
diff --git a/...component-template/profiling-symbols.json → ...component-template/profiling-symbols.json b/...component-template/profiling-symbols.json → ...component-template/profiling-symbols.json
diff --git a/...rofiler/ilm-policy/profiling-60-days.json → ...ofiling/ilm-policy/profiling-60-days.json b/...rofiler/ilm-policy/profiling-60-days.json → ...ofiling/ilm-policy/profiling-60-days.json
diff --git a/...iler/index-template/profiling-events.json → ...ling/index-template/profiling-events.json b/...iler/index-template/profiling-events.json → ...ling/index-template/profiling-events.json
diff --git a/...index-template/profiling-executables.json → ...index-template/profiling-executables.json b/...index-template/profiling-executables.json → ...index-template/profiling-executables.json
diff --git a/...filer/index-template/profiling-hosts.json → ...iling/index-template/profiling-hosts.json b/...filer/index-template/profiling-hosts.json → ...iling/index-template/profiling-hosts.json
diff --git a/...ler/index-template/profiling-metrics.json → ...ing/index-template/profiling-metrics.json b/...ler/index-template/profiling-metrics.json → ...ing/index-template/profiling-metrics.json
diff --git a/...emplate/profiling-returnpads-private.json → ...emplate/profiling-returnpads-private.json b/...emplate/profiling-returnpads-private.json → ...emplate/profiling-returnpads-private.json
diff --git a/...ex-template/profiling-sq-executables.json → ...ex-template/profiling-sq-executables.json b/...ex-template/profiling-sq-executables.json → ...ex-template/profiling-sq-executables.json
diff --git a/...dex-template/profiling-sq-leafframes.json → ...dex-template/profiling-sq-leafframes.json b/...dex-template/profiling-sq-leafframes.json → ...dex-template/profiling-sq-leafframes.json
diff --git a/...index-template/profiling-stackframes.json → ...index-template/profiling-stackframes.json b/...index-template/profiling-stackframes.json → ...index-template/profiling-stackframes.json
diff --git a/...index-template/profiling-stacktraces.json → ...index-template/profiling-stacktraces.json b/...index-template/profiling-stacktraces.json → ...index-template/profiling-stacktraces.json
diff --git a/...ex-template/profiling-symbols-global.json → ...ex-template/profiling-symbols-global.json b/...ex-template/profiling-symbols-global.json → ...ex-template/profiling-symbols-global.json
diff --git a/...x-template/profiling-symbols-private.json → ...x-template/profiling-symbols-private.json b/...x-template/profiling-symbols-private.json → ...x-template/profiling-symbols-private.json
diff --git a/...iling/src/main/java/org/elasticsearch/xpack/profiling/ProfilingIndexTemplateRegistry.java b/...iling/src/main/java/org/elasticsearch/xpack/profiling/ProfilingIndexTemplateRegistry.java
@@ -89,7 +89,7 @@ protected boolean requiresMasterNode() {
     private static final List<LifecyclePolicy> LIFECYCLE_POLICIES = List.of(
         new LifecyclePolicyConfig(
             "profiling-60-days",
-            "/profiler/ilm-policy/profiling-60-days.json",
+            "/profiling/ilm-policy/profiling-60-days.json",
             Map.of(PROFILING_TEMPLATE_VERSION_VARIABLE, String.valueOf(INDEX_TEMPLATE_VERSION))
         ).load(LifecyclePolicyConfig.DEFAULT_X_CONTENT_REGISTRY)
     );
@@ -106,61 +106,61 @@ protected List<LifecyclePolicy> getPolicyConfigs() {
         for (IndexTemplateConfig config : List.of(
             new IndexTemplateConfig(
                 "profiling-events",
-                "/profiler/component-template/profiling-events.json",
+                "/profiling/component-template/profiling-events.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE,
                 indexVersion("events", PROFILING_EVENTS_VERSION)
             ),
             new IndexTemplateConfig(
                 "profiling-executables",
-                "/profiler/component-template/profiling-executables.json",
+                "/profiling/component-template/profiling-executables.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE,
                 indexVersion("executables", PROFILING_EXECUTABLES_VERSION)
             ),
             new IndexTemplateConfig(
                 "profiling-ilm",
-                "/profiler/component-template/profiling-ilm.json",
+                "/profiling/component-template/profiling-ilm.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE
             ),
             new IndexTemplateConfig(
                 "profiling-hot-tier",
-                "/profiler/component-template/profiling-hot-tier.json",
+                "/profiling/component-template/profiling-hot-tier.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE
             ),
             new IndexTemplateConfig(
                 "profiling-metrics",
-                "/profiler/component-template/profiling-metrics.json",
+                "/profiling/component-template/profiling-metrics.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE,
                 indexVersion("metrics", PROFILING_METRICS_VERSION)
             ),
             new IndexTemplateConfig(
                 "profiling-hosts",
-                "/profiler/component-template/profiling-hosts.json",
+                "/profiling/component-template/profiling-hosts.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE,
                 indexVersion("hosts", PROFILING_HOSTS_VERSION)
             ),
             new IndexTemplateConfig(
                 "profiling-stackframes",
-                "/profiler/component-template/profiling-stackframes.json",
+                "/profiling/component-template/profiling-stackframes.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE,
                 indexVersion("stackframes", PROFILING_STACKFRAMES_VERSION)
             ),
             new IndexTemplateConfig(
                 "profiling-stacktraces",
-                "/profiler/component-template/profiling-stacktraces.json",
+                "/profiling/component-template/profiling-stacktraces.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE,
                 indexVersion("stacktraces", PROFILING_STACKTRACES_VERSION)
             ),
             new IndexTemplateConfig(
                 "profiling-symbols",
-                "/profiler/component-template/profiling-symbols.json",
+                "/profiling/component-template/profiling-symbols.json",
                 INDEX_TEMPLATE_VERSION,
                 PROFILING_TEMPLATE_VERSION_VARIABLE,
                 indexVersion("symbols", PROFILING_SYMBOLS_VERSION)
@@ -190,71 +190,71 @@ protected Map<String, ComponentTemplate> getComponentTemplateConfigs() {
     private static final Map<String, ComposableIndexTemplate> COMPOSABLE_INDEX_TEMPLATE_CONFIGS = parseComposableTemplates(
         new IndexTemplateConfig(
             "profiling-events",
-            "/profiler/index-template/profiling-events.json",
+            "/profiling/index-template/profiling-events.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE
         ),
         new IndexTemplateConfig(
             "profiling-metrics",
-            "/profiler/index-template/profiling-metrics.json",
+            "/profiling/index-template/profiling-metrics.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE
         ),
         new IndexTemplateConfig(
             "profiling-hosts",
-            "/profiler/index-template/profiling-hosts.json",
+            "/profiling/index-template/profiling-hosts.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE
         ),
         new IndexTemplateConfig(
             "profiling-executables",
-            "/profiler/index-template/profiling-executables.json",
+            "/profiling/index-template/profiling-executables.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE
         ),
         new IndexTemplateConfig(
             "profiling-stackframes",
-            "/profiler/index-template/profiling-stackframes.json",
+            "/profiling/index-template/profiling-stackframes.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE
         ),
         new IndexTemplateConfig(
             "profiling-stacktraces",
-            "/profiler/index-template/profiling-stacktraces.json",
+            "/profiling/index-template/profiling-stacktraces.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE
         ),
         // templates for regular indices
         new IndexTemplateConfig(
             "profiling-returnpads-private",
-            "/profiler/index-template/profiling-returnpads-private.json",
+            "/profiling/index-template/profiling-returnpads-private.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE,
             indexVersion("returnpads.private", PROFILING_RETURNPADS_PRIVATE_VERSION)
         ),
         new IndexTemplateConfig(
             "profiling-sq-executables",
-            "/profiler/index-template/profiling-sq-executables.json",
+            "/profiling/index-template/profiling-sq-executables.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE,
             indexVersion("sq.executables", PROFILING_SQ_EXECUTABLES_VERSION)
         ),
         new IndexTemplateConfig(
             "profiling-sq-leafframes",
-            "/profiler/index-template/profiling-sq-leafframes.json",
+            "/profiling/index-template/profiling-sq-leafframes.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE,
             indexVersion("sq.leafframes", PROFILING_SQ_LEAFFRAMES_VERSION)
         ),
         new IndexTemplateConfig(
             "profiling-symbols-global",
-            "/profiler/index-template/profiling-symbols-global.json",
+            "/profiling/index-template/profiling-symbols-global.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE
         ),
         new IndexTemplateConfig(
             "profiling-symbols-private",
-            "/profiler/index-template/profiling-symbols-private.json",
+            "/profiling/index-template/profiling-symbols-private.json",
             INDEX_TEMPLATE_VERSION,
             PROFILING_TEMPLATE_VERSION_VARIABLE
         )