Reformat numbers

Author: dbudziwojskiNR

charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml

@@ -482,13 +482,13 @@ data:
           - name: node.cpu.usage.percentage
             type: scale
             metric1: k8s.node.cpu.usage
-            scale_by: CPU_PLACEHOLDER
+            scale_by: NODE_CPU_ALLOCATABLE_PLACEHOLDER
+            operation: divide
+          - name: node.memory.usage.percentage
+            type: scale
+            metric1: k8s.node.memory.working_set
+            scale_by: NODE_MEMORY_ALLOCATABLE_PLACEHOLDER
             operation: divide
-{{/*          - name: node.memory.usage.percentage*/}}
-{{/*            type: scale*/}}
-{{/*            metric1: k8s.node.memory.working_set*/}}
-{{/*            scale_by: ${NODE_MEMORY_ALLOCATABLE}*/}}
-{{/*            operation: divide*/}}
 
 
       transform/tag_generated_metrics_ldm:

charts/nr-k8s-otel-collector/templates/daemonset.yaml

@@ -43,10 +43,20 @@ spec:
             - |
               NODE_NAME=$(echo $KUBE_NODE_NAME)
               echo "Node Name: $KUBE_NODE_NAME"
+
               export NODE_CPU_ALLOCATABLE=$(kubectl get node $NODE_NAME -o jsonpath='{.status.allocatable.cpu}')
+              # Convert milliCPU values to plain CPU values
+              if [[ $NODE_CPU_ALLOCATABLE == *m ]]; then
+                # Strip the 'm' and convert the milliCPUs to CPUs
+                export NODE_CPU_ALLOCATABLE=$(awk "BEGIN {print ${NODE_CPU_ALLOCATABLE%?} / 1000}")
+              fi
+
+              export NODE_MEMORY_ALLOCATABLE=$(kubectl get node $NODE_NAME -o jsonpath='{.status.allocatable.memory}' | numfmt --from=auto)
               echo "NODE_CPU_ALLOCATABLE : $NODE_CPU_ALLOCATABLE"
+              echo "NODE_MEMORY_ALLOCATABLE : $NODE_MEMORY_ALLOCATABLE"
               cp /temp-config/daemonset-config.yaml /final-config
-              yq -i '.processors.metricsgeneration/calculate_percentage.rules[2].scale_by = env(NODE_CPU_ALLOCATABLE)' /final-config/daemonset-config.yaml
+              yq -i '(.processors.metricsgeneration/calculate_percentage.rules[] | select(.name == "node.cpu.usage.percentage").scale_by) = env(NODE_CPU_ALLOCATABLE)' /final-config/daemonset-config.yaml
+              yq -i '(.processors.metricsgeneration/calculate_percentage.rules[] | select(.name == "node.memory.usage.percentage").scale_by) = env(NODE_MEMORY_ALLOCATABLE)' /final-config/daemonset-config.yaml
               cat /final-config/daemonset-config.yaml
           env:
             - name: KUBE_NODE_NAME