flat formatting

README.md

@@ -171,6 +171,63 @@ eos : end of sync. Tell Junos to send end of sync for on-change subscriptions.
 grpc/ws : window size of grpc for slower clients
 </pre>
 
+
+## IPv6 Support
+
+jtimon supports both IPv4 and IPv6 addresses for connecting to network devices.
+
+### IPv4 Configuration
+```json
+{
+    "host": "192.168.1.1",
+    "port": 32767,
+    "user": "username",
+    "password": "password",
+    "paths": [
+        {
+            "path": "/interfaces",
+            "freq": 10000
+        }
+    ]
+}
+```
+
+### IPv6 Configuration
+When using IPv6 addresses, wrap the address in square brackets `[]`:
+
+```json
+{
+    "host": "[2001:db8::1]",
+    "port": 32767,
+    "user": "username", 
+    "password": "password",
+    "paths": [
+        {
+            "path": "/interfaces",
+            "freq": 10000
+        }
+    ]
+}
+```
+
+**Note**: The square brackets are required for IPv6 addresses to properly distinguish the address from the port number, following RFC 3986 standards.
+
+### Examples of Valid IPv6 Formats
+- `"[::1]"` - IPv6 loopback
+- `"[2001:db8::1]"` - Full IPv6 address
+- `"[fe80::1%eth0]"` - Link-local with zone identifier
+- `"[::ffff:192.0.2.1]"` - IPv4-mapped IPv6 address
+
+### Command Line Usage
+When using command line options for dial-out or server mode:
+```bash
+# IPv4
+./jtimon --host 127.0.0.1 --port 32767
+
+# IPv6  
+./jtimon --host ::1 --port 32767
+```
+
 ## Kafka Publish
 
 To publish gRPC/Openconfig JTI data to Kafka, use the following json config.

config.go

@@ -42,6 +42,7 @@ type Config struct {
 // GnmiConfig definition
 type GnmiConfig struct {
 	Encoding string
+	Mode     int16
 }
 
 // VendorConfig definition
@@ -95,12 +96,14 @@ type TLSConfig struct {
 
 // PathsConfig to specify subscription path, reporting-interval (freq), etc,.
 type PathsConfig struct {
-	Path    string `json:"path"`
-	Freq    uint64 `json:"freq"`
-	Mode    string `json:"mode"`
-	Origin  string `json:"origin"`
-	PreGnmi bool   `json:"pre-gnmi"`
-	Gnmi    bool   `json:"gnmi"`
+	Path                    string `json:"path"`
+	Freq                    uint64 `json:"freq"`
+	Mode                    string `json:"mode"`
+	Origin                  string `json:"origin"`
+	Target                  string `json:"target"`
+	PreGnmi                 bool   `json:"pre-gnmi"`
+	Gnmi                    bool   `json:"gnmi"`
+	Gnmi_heartbeat_interval uint64 `json:"gnmi_heartbeat_interval"`
 }
 
 // NewJTIMONConfigFilelist to return configfilelist object
@@ -323,6 +326,7 @@ func HandleConfigChange(jctx *JCtx, config Config, restart *bool) error {
 		jctx.config = config
 		logInit(jctx)
 		internalJtimonLogInit(jctx)
+		initInternalJtimon(jctx)
 		if restart != nil {
 			jLog(jctx, fmt.Sprintf("Restarting worker process to spawn new device connection for: %s", jctx.file))
 			*restart = true
@@ -348,6 +352,7 @@ func ConfigRead(jctx *JCtx, init bool, restart *bool) error {
 		jctx.config = config
 		logInit(jctx)
 		internalJtimonLogInit(jctx)
+		initInternalJtimon(jctx)
 		b, err := json.MarshalIndent(jctx.config, "", "    ")
 		if err != nil {
 			return fmt.Errorf("config parsing error (json marshal) for %s: %v", jctx.file, err)

gnmi_utils.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"bytes"
+	"encoding/binary"
+	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -72,48 +74,47 @@ type gnmiParseOutputT struct {
 	inKvs      uint64
 }
 
-
 // parseKeyValuePairs takes an input string in the format `prefix[key = "value"]`
 // and returns the prefix as a string and the key-value pairs as a map.
 //
 // The input string can contain multiple key-value pairs in the same or different brackets.
 // The keys and values are trimmed of quotes and spaces.
 //
-// If the input string does not contain any brackets, the function returns the entire string 
+// If the input string does not contain any brackets, the function returns the entire string
 // as the prefix and an empty map.
 func parseKeyValuePairs(input string) (string, map[string]string) {
-    // Initialize a map to hold the key-value pairs
-    result := make(map[string]string)
+	// Initialize a map to hold the key-value pairs
+	result := make(map[string]string)
 
-    // Split the input string by the first occurrence of [" to get the prefix and the rest
-    parts := strings.SplitN(input, "[", 2)
-    prefix := parts[0]
+	// Split the input string by the first occurrence of [" to get the prefix and the rest
+	parts := strings.SplitN(input, "[", 2)
+	prefix := parts[0]
 
-    // Match anything inside square brackets
-    re := regexp.MustCompile(`\[(.*?)\]`)
-    matches := re.FindAllString(input, -1)
+	// Match anything inside square brackets
+	re := regexp.MustCompile(`\[(.*?)\]`)
+	matches := re.FindAllString(input, -1)
 
-    for _, match := range matches {
-        // Remove the square brackets
-        match = strings.Trim(match, "[]")
+	for _, match := range matches {
+		// Remove the square brackets
+		match = strings.Trim(match, "[]")
 
-        // Split by "and" to support multiple key-value pairs in the same brackets
-        pairs := strings.Split(match, "and")
+		// Split by "and" to support multiple key-value pairs in the same brackets
+		pairs := strings.Split(match, "and")
 
-        for _, pair := range pairs {
-            // Split by "=" to separate the key and value
-            kv := strings.Split(pair, "=")
+		for _, pair := range pairs {
+			// Split by "=" to separate the key and value
+			kv := strings.Split(pair, "=")
 
-            // Trim the quotes and spaces from the key and value
-            key := strings.Trim(kv[0], " \"")
-            value := strings.Trim(kv[1], " \"")
+			// Trim the quotes and spaces from the key and value
+			key := strings.Trim(kv[0], " \"")
+			value := strings.Trim(kv[1], " \"")
 
-            // Add the key-value pair to the result map
-            result[key] = value
-        }
-    }
+			// Add the key-value pair to the result map
+			result[key] = value
+		}
+	}
 
-    return prefix, result
+	return prefix, result
 }
 
 // Convert xpath to gNMI path
@@ -359,7 +360,16 @@ func gnmiParseValue(gnmiValue *gnmi.TypedValue, ts bool, enableUint bool) (inter
 	case *gnmi.TypedValue_BoolVal:
 		value = gnmiValue.GetBoolVal()
 	case *gnmi.TypedValue_BytesVal:
-		value = gnmiValue.GetBytesVal()
+		byteVal := gnmiValue.GetBytesVal()
+		if len(byteVal) == 4 {
+			var double_val float32
+			if err := binary.Read(bytes.NewReader(byteVal), binary.LittleEndian, &double_val); err != nil {
+				value = hex.EncodeToString(byteVal)
+			}
+			value = fmt.Sprintf("%0.2f", double_val)
+		} else {
+			value = hex.EncodeToString(byteVal)
+		}
 	case *gnmi.TypedValue_AsciiVal:
 		value = gnmiValue.GetAsciiVal()
 	case *gnmi.TypedValue_AnyVal:
@@ -529,3 +539,8 @@ func formJuniperTelemetryHdr(jXpaths *jnprXpathDetails, gnmiExt []*gnmi_ext1.Ext
 	return &juniperHdrDetails, true, nil
 
 }
+
+func gnmiHeartBeat(hb uint64) uint64 {
+	hb_val := (hb * gGnmiFreqUnits) / 10000
+	return hb_val
+}

grpc.go

@@ -47,7 +47,7 @@ func getGPRCDialOptions(jctx *JCtx, vendor *vendor) ([]grpc.DialOption, error) {
 		return nil, err
 	}
 
-	if *stateHandler {
+	if *statsHandler {
 		opts = append(opts, grpc.WithStatsHandler(&statshandler{jctx: jctx}))
 		if isCsvStatsEnabled(jctx) {
 			jctx.config.InternalJtimon.csvLogger.Printf(fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s,%s\n",

influx.go

@@ -503,6 +503,17 @@ func addIDB(ocData *na_pb.OpenConfigData, jctx *JCtx, rtime time.Time) {
 			value32 := v.GetFloatValue()
 			checkAndCeilFloatValues(&value32, nil, &floatVal)
 			kv[xmlpath] = floatVal
+		case *na_pb.KeyValue_LeaflistValue:
+			e := v.GetLeaflistValue().Element
+			var leafListStr string
+			for _, elem := range e {
+				switch elem.Value.(type) {
+				case *na_pb.TypedValue_LeaflistStrValue:
+					llStrValue := elem.GetLeaflistStrValue()
+					leafListStr = leafListStr + llStrValue + ","
+				}
+			}
+			kv[xmlpath] = leafListStr[:len(leafListStr)-1]
 		default:
 		}