Parse optional category from default labels in extractor_info.json

Author: bodom0015

app/api/Extractions.scala

@@ -477,11 +477,17 @@ class Extractions @Inject()(
         extractors.updateExtractorInfo(info) match {
           case Some(u) => {
             // Create/assign any default labels for this extractor
-            u.defaultLabels.foreach(labelName => {
+            u.defaultLabels.foreach(labelStr => {
+              val segments = labelStr.split("/")
+              val (labelName, labelCategory) = if (segments.length > 1) {
+                (segments(1), segments(0))
+              } else {
+                (segments(0), "Other")
+              }
               extractors.getExtractorsLabel(labelName) match {
                 case None => {
-                  // Label does not exist - create then assign it
-                  val createdLabel = extractors.createExtractorsLabel(labelName, Some("Default"), List[String](u.name))
+                  // Label does not exist - create and assign it
+                  val createdLabel = extractors.createExtractorsLabel(labelName, Some(labelCategory), List[String](u.name))
                 }
                 case Some(lbl) => {
                   // Label already exists, assign it

app/services/RabbitmqPlugin.scala

@@ -1256,11 +1256,17 @@ class ExtractorsHeartbeats(channel: Channel, queue: String) extends Actor {
                 case None => {}
                 case Some(eInfo) => {
                   // Create (if needed) and assign default labels
-                  eInfo.defaultLabels.foreach(labelName => {
+                  eInfo.defaultLabels.foreach(labelStr => {
+                    val segments = labelStr.split("/")
+                    val (labelName, labelCategory) = if (segments.length > 1) {
+                      (segments(1), segments(0))
+                    } else {
+                      (segments(0), "Other")
+                    }
                     extractorsService.getExtractorsLabel(labelName) match {
                       case None => {
-                        // Label does not exist - create then assign it
-                        val createdLabel = extractorsService.createExtractorsLabel(labelName, Some("Default"), List[String](eInfo.name))
+                        // Label does not exist - create and assign it
+                        val createdLabel = extractorsService.createExtractorsLabel(labelName, Some(labelCategory), List[String](eInfo.name))
                       }
                       case Some(lbl) => {
                         // Label already exists, assign it