Add index_types for OTEL logs and metrics opensearch-project#3148

Signed-off-by: Jürgen Walter <juergen.walter@sap.com>
juergen-walter · Jan 9, 2024 · f9b9580 · f9b9580
1 parent 774fa21
commit f9b9580
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/...ain/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java b/...ain/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java
@@ -401,6 +401,10 @@ private Map<String, Object> readIndexTemplate(final String templateFile, final I
                 templateURL = loadExistingTemplate(templateType, IndexConstants.RAW_DEFAULT_TEMPLATE_FILE);
             } else if (indexType.equals(IndexType.TRACE_ANALYTICS_SERVICE_MAP)) {
                 templateURL = loadExistingTemplate(templateType, IndexConstants.SERVICE_MAP_DEFAULT_TEMPLATE_FILE);
+            } else if (indexType.equals(IndexType.LOG_ANALYTICS)) {
+                templateURL = loadExistingTemplate(templateType, IndexConstants.LOGS_DEFAULT_TEMPLATE_FILE);
+            } else if (indexType.equals(IndexType.METRIC_ANALYTICS)) {
+                templateURL = loadExistingTemplate(templateType, IndexConstants.METRICS_DEFAULT_TEMPLATE_FILE);
             } else if (templateFile != null) {
                 if (templateFile.toLowerCase().startsWith(S3_PREFIX)) {
                     FileReader s3FileReader = new S3FileReader(s3Client);

diff --git a/...rc/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java b/...rc/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java
@@ -26,7 +26,9 @@ public class IndexConstants {
 
   static {
     // TODO: extract out version number into version enum
-    TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_RAW, "otel-v1-apm-span");
     TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_SERVICE_MAP, "otel-v1-apm-service-map");
+    TYPE_TO_DEFAULT_ALIAS.put(IndexType.TRACE_ANALYTICS_RAW, "otel-v1-apm-span");
+    TYPE_TO_DEFAULT_ALIAS.put(IndexType.LOG_ANALYTICS, "logs-otel-v1");
+    TYPE_TO_DEFAULT_ALIAS.put(IndexType.METRIC_ANALYTICS, "metrics-otel-v1");
   }
 }
diff --git a/...rch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java b/...rch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java
@@ -14,6 +14,8 @@
 public enum IndexType {
     TRACE_ANALYTICS_RAW("trace-analytics-raw"),
     TRACE_ANALYTICS_SERVICE_MAP("trace-analytics-service-map"),
+    LOG_ANALYTICS("log-analytics"),
+    METRIC_ANALYTICS("metric-analytics"),
     CUSTOM("custom"),
     MANAGEMENT_DISABLED("management_disabled");