From 82379b5013107d51c8c68aba1de40059c14baf27 Mon Sep 17 00:00:00 2001
From: ipatini <ipatini@mail.ntua.gr>
Date: Mon, 3 Jun 2024 19:23:02 +0300
Subject: [PATCH] Bugfix in ShorthandsExpansionHelper

Change-Id: Ia4447b71b8cf5b176dd4058d138dd2bfa573a884
---
 .../install/ClientInstallationProperties.java |  2 -
 .../main/resources/ems-client-daemonset.yaml  |  2 +
 .../analyze/ShorthandsExpansionHelper.java    | 43 +++++++++++++------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/nebulous/ems-core/baguette-client-install/src/main/java/gr/iccs/imu/ems/baguette/client/install/ClientInstallationProperties.java b/nebulous/ems-core/baguette-client-install/src/main/java/gr/iccs/imu/ems/baguette/client/install/ClientInstallationProperties.java
index 1f7aca2..166f91f 100644
--- a/nebulous/ems-core/baguette-client-install/src/main/java/gr/iccs/imu/ems/baguette/client/install/ClientInstallationProperties.java
+++ b/nebulous/ems-core/baguette-client-install/src/main/java/gr/iccs/imu/ems/baguette/client/install/ClientInstallationProperties.java
@@ -116,9 +116,7 @@ public class ClientInstallationProperties implements InitializingBean {
 
     private K8sClientInstallationProperties k8s = new K8sClientInstallationProperties();
 
-    @Slf4j
     @Data
-    @Configuration
     public static class K8sClientInstallationProperties {
         private Map<String,String> extraEnvVars = new LinkedHashMap<>();
     }
diff --git a/nebulous/ems-core/baguette-client-install/src/main/resources/ems-client-daemonset.yaml b/nebulous/ems-core/baguette-client-install/src/main/resources/ems-client-daemonset.yaml
index ebee07d..0945643 100644
--- a/nebulous/ems-core/baguette-client-install/src/main/resources/ems-client-daemonset.yaml
+++ b/nebulous/ems-core/baguette-client-install/src/main/resources/ems-client-daemonset.yaml
@@ -63,6 +63,8 @@ spec:
               value: 'DEFAULT_IP'
             - name: BAGUETTE_CLIENT_BASE_DIR
               value: '/opt/baguette-client'
+#            - name: LOGGING_LEVEL_GR_ICCS_IMU_EMS
+#              value: 'DEBUG'
             - name: BAGUETTE_CLIENT_ID
               valueFrom:
                 fieldRef:
diff --git a/nebulous/ems-nebulous/src/main/java/eu/nebulous/ems/translate/analyze/ShorthandsExpansionHelper.java b/nebulous/ems-nebulous/src/main/java/eu/nebulous/ems/translate/analyze/ShorthandsExpansionHelper.java
index bf32f0b..84a2dde 100644
--- a/nebulous/ems-nebulous/src/main/java/eu/nebulous/ems/translate/analyze/ShorthandsExpansionHelper.java
+++ b/nebulous/ems-nebulous/src/main/java/eu/nebulous/ems/translate/analyze/ShorthandsExpansionHelper.java
@@ -123,7 +123,6 @@ public class ShorthandsExpansionHelper {
         // ----- Expand Metric sensors -----
         List<Object> expandedSensors = asList(ctx
                 .read("$.spec.*.*.metrics.*[?(@.sensor)]", List.class)).stream()
-                .filter(item -> JsonPath.read(item, "$.sensor") instanceof String)
                 .peek(this::expandSensor)
                 .toList();
         log.debug("ShorthandsExpansionHelper: Sensors expanded: {}", expandedSensors);
@@ -236,18 +235,38 @@ public class ShorthandsExpansionHelper {
     }
 
     private void expandSensor(Object spec) {
-        log.debug("ShorthandsExpansionHelper.expandSensor: {}", spec);
-        String constraintStr = JsonPath.read(spec, "$.sensor").toString().trim();
-        Matcher matcher = METRIC_SENSOR_PATTERN.matcher(constraintStr);
-        if (matcher.matches()) {
-            asMap(spec).put("sensor", Map.of(
-                    "type", matcher.group(1),
-                    "config", Map.of(
-                            EmsConstant.NETDATA_METRIC_KEY, matcher.group(2)
-                    )
-            ));
+        log.debug("ShorthandsExpansionHelper.expandSensor: BEGIN: {}", spec);
+        Object sensorSpec = JsonPath.read(spec, "$.sensor");
+        log.trace("ShorthandsExpansionHelper.expandSensor: sensorSpec: {}", sensorSpec);
+
+        String typeSpecStr = null;
+        if (sensorSpec instanceof String s) {
+            typeSpecStr = s.trim();
+            sensorSpec = new LinkedHashMap<>();
+            asMap(spec).put("sensor", sensorSpec);
         } else
-            throw createException("Invalid metric sensor shorthand expression: "+spec);
+        if (sensorSpec instanceof Map map) {
+            if (map.get("type")==null || !(map.get("type") instanceof String))
+                throw createException("Invalid metric sensor spec. No sensor type: " + spec);
+            typeSpecStr = map.get("type").toString().trim();
+        }
+
+        if (StringUtils.isNotBlank(typeSpecStr)) {
+            Matcher matcher = METRIC_SENSOR_PATTERN.matcher(typeSpecStr);
+            if (matcher.matches()) {
+                asMap(sensorSpec).put("type", matcher.group(1));
+                Object sensorConfigSpec = asMap(sensorSpec).get("config");
+                Map<String, Object> sensorConfigMap = sensorConfigSpec == null
+                        ? new LinkedHashMap<>()
+                        : asMap(sensorConfigSpec);
+                asMap(sensorSpec).put("config", sensorConfigMap);
+                sensorConfigMap.put(EmsConstant.NETDATA_METRIC_KEY, matcher.group(2));
+            } else {
+                asMap(sensorSpec).put("type", typeSpecStr);
+            }
+        } else
+            throw createException("Invalid metric sensor shorthand expression or sensor specification: " + spec);
+        log.trace("ShorthandsExpansionHelper.expandSensor: END: {}", spec);
     }
 
     /*private void expandConstraint(Object spec) {