Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added override control of eos in internal jtimon configs #42

Merged
merged 3 commits into from
Jun 25, 2024
Merged

added override control of eos in internal jtimon configs #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8c2d5d
added override control of eos in internal jtimon configs
amohit1315 Jun 20, 2024
d17b94b
added auto unit tests update
amohit1315 Jun 21, 2024
dd154db
fixed eos enhancement and subscription issue for single path
amohit1315 Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,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
Expand All @@ -348,6 +349,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)
Expand Down
13 changes: 13 additions & 0 deletions internal_jtimon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ type InternalJtimonConfig struct {
logger *log.Logger
preGnmiLogger *log.Logger
csvLogger *log.Logger
GnmiEOS bool `json:"gnmi-eos"`
PreGnmiEOS bool `json:"pre-gnmi-eos"`
}

func initInternalJtimon(jctx *JCtx) {
// if Internal Jtimon EOS value is not set,
// then take the EOS value from parent config
if !jctx.config.InternalJtimon.GnmiEOS {
jctx.config.InternalJtimon.GnmiEOS = jctx.config.EOS
}
if !jctx.config.InternalJtimon.PreGnmiEOS {
jctx.config.InternalJtimon.PreGnmiEOS = jctx.config.EOS
}
}

func internalJtimonLogInit(jctx *JCtx) {
Expand Down
8 changes: 6 additions & 2 deletions multi_vendor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,16 @@ func subscribePrePostGNMI(conn *grpc.ClientConn, jctx *JCtx, cfg Config, paths [
// Launch goroutines for each subscription function
go func() {
gnmiPaths := getGnmiPaths(cfg)
gnmiResultCh <- subscribegNMI(conn, jctx, cfg, gnmiPaths)
if len(gnmiPaths) > 0 {
gnmiResultCh <- subscribegNMI(conn, jctx, cfg, gnmiPaths)
}
}()

go func() {
preGnmiPaths := getPreGnmiPaths(cfg)
junosResultCh <- subscribeJunos(conn, jctx, cfg, preGnmiPaths)
if len(preGnmiPaths) > 0 {
junosResultCh <- subscribeJunos(conn, jctx, cfg, preGnmiPaths)
}
}()

// Use select to wait for the first result to be available
Expand Down
9 changes: 7 additions & 2 deletions subscribe_gnmi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,8 @@ func gnmiHandleResponse(jctx *JCtx, rsp *gnmi.SubscribeResponse) error {
parseOutput = &tmpParseOp
err error

hostname = jctx.config.Host + ":" + strconv.Itoa(jctx.config.Port)
eosEnabled = false
hostname = jctx.config.Host + ":" + strconv.Itoa(jctx.config.Port)
)

// Update packet stats
Expand All @@ -316,7 +317,11 @@ func gnmiHandleResponse(jctx *JCtx, rsp *gnmi.SubscribeResponse) error {
updateStatsKV(jctx, true, parseOutput.inKvs)

// Ignore all packets till sync response is received.
if !jctx.config.EOS {
eosEnabled = jctx.config.EOS
if isInternalJtimonLogging(jctx) {
eosEnabled = jctx.config.InternalJtimon.GnmiEOS
}
if !eosEnabled {
if !jctx.receivedSyncRsp {
if parseOutput.jHeader != nil {
// For juniper packets, ignore only the packets which are numbered in initial sync sequence range
Expand Down
4 changes: 4 additions & 0 deletions subscribe_juniper_junos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ func subscribeJunos(conn *grpc.ClientConn, jctx *JCtx, cfg Config, paths []Paths
subReqM.PathList = append(subReqM.PathList, &pathM)
}
additionalConfigM.NeedEos = jctx.config.EOS
// Override EOS if InternalJtimon is configured
if isInternalJtimonLogging(jctx) {
additionalConfigM.NeedEos = jctx.config.InternalJtimon.PreGnmiEOS
}
subReqM.AdditionalConfig = &additionalConfigM

return subSendAndReceive(conn, jctx, subReqM)
Expand Down
3 changes: 2 additions & 1 deletion tests/data/cisco-ios-xr/config/xr-all-influx.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Running config of JTIMON:
"internal-jtimon": {
"data-log-file": "",
"csv-log-file": "",
"csv-stats": false
"gnmi-eos": false,
"pre-gnmi-eos": false
},
"paths": [
{
Expand Down
3 changes: 2 additions & 1 deletion tests/data/cisco-ios-xr/config/xr-wdsysmon-influx.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Running config of JTIMON:
"internal-jtimon": {
"data-log-file": "",
"csv-log-file": "",
"csv-stats": false
"gnmi-eos": false,
"pre-gnmi-eos": false
},
"paths": [
{
Expand Down
13 changes: 7 additions & 6 deletions tests/data/juniper-junos/config/jtisim-influx-alias.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Running config of JTIMON:
"internal-jtimon": {
"data-log-file": "",
"csv-log-file": "",
"csv-stats": false
"gnmi-eos": false,
"pre-gnmi-eos": false
},
"paths": [
{
Expand Down Expand Up @@ -91,22 +92,22 @@ Receiving telemetry data from 127.0.0.1:50051
+------------------------------+--------------------+--------------------+--------------------+--------------------+
| Timestamp | KV | Packets | Bytes | Bytes(wire) |
+------------------------------+--------------------+--------------------+--------------------+--------------------+
| Fri May 31 02:22:48 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:31 PDT 2024 | 1980 | 40 | 87418 | 87618 |

Batch processing: #packets:40 #points:40
Batch write successful! Post batch write available points: 0

| Fri May 31 02:22:50 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:33 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:22:52 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:35 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:22:54 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:37 PDT 2024 | 1980 | 40 | 87418 | 87618 |



Collector Stats for 127.0.0.1:50051 (Run time : 8.007675042s)
Collector Stats for 127.0.0.1:50051 (Run time : 8.010581416s)
40 : in-packets
1980 : data points (KV pairs)
25 : in-header wirelength (bytes)
Expand Down
31 changes: 16 additions & 15 deletions tests/data/juniper-junos/config/jtisim-influx.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Running config of JTIMON:
"internal-jtimon": {
"data-log-file": "",
"csv-log-file": "",
"csv-stats": false
"gnmi-eos": false,
"pre-gnmi-eos": false
},
"paths": [
{
Expand Down Expand Up @@ -85,57 +86,57 @@ New alias creation failed for 127.0.0.1, err: open : no such file or directory
compression = none
Connecting to 127.0.0.1:50051
gRPC headers from host 127.0.0.1:50051
content-type: [application/grpc]
jtisim: [yes]
content-type: [application/grpc]
Receiving telemetry data from 127.0.0.1:50051

+------------------------------+--------------------+--------------------+--------------------+--------------------+
| Timestamp | KV | Packets | Bytes | Bytes(wire) |
+------------------------------+--------------------+--------------------+--------------------+--------------------+
| Fri May 31 02:22:23 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:06 PDT 2024 | 1980 | 40 | 87418 | 87618 |

Batch processing: #packets:40 #points:40
Batch write successful! Post batch write available points: 0

| Fri May 31 02:22:25 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:08 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:22:27 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:10 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:22:29 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:12 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:22:31 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:38:14 PDT 2024 | 1980 | 40 | 87418 | 87618 |

Batch processing: #packets:40 #points:40

| Fri May 31 02:22:33 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:38:16 PDT 2024 | 3960 | 80 | 174838 | 175238 |

Batch write successful! Post batch write available points: 0

| Fri May 31 02:22:35 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:38:18 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:22:37 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:38:20 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:22:39 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:38:22 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:22:41 PDT 2024 | 5367 | 109 | 236698 | 237243 |
| Tue Jun 25 11:38:24 PDT 2024 | 4040 | 82 | 178196 | 178606 |

Batch processing: #packets:40 #points:40

| Fri May 31 02:22:43 PDT 2024 | 5940 | 120 | 262258 | 262858 |
| Tue Jun 25 11:38:26 PDT 2024 | 5940 | 120 | 262258 | 262858 |

Batch write successful! Post batch write available points: 0

| Fri May 31 02:22:45 PDT 2024 | 5940 | 120 | 262258 | 262858 |
| Tue Jun 25 11:38:28 PDT 2024 | 5940 | 120 | 262258 | 262858 |



Collector Stats for 127.0.0.1:50051 (Run time : 25.004155208s)
Collector Stats for 127.0.0.1:50051 (Run time : 25.004049042s)
120 : in-packets
5940 : data points (KV pairs)
25 : in-header wirelength (bytes)
Expand Down
31 changes: 16 additions & 15 deletions tests/data/juniper-junos/config/jtisim-interfaces-1.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Running config of JTIMON:
"internal-jtimon": {
"data-log-file": "",
"csv-log-file": "",
"csv-stats": false
"gnmi-eos": false,
"pre-gnmi-eos": false
},
"paths": [
{
Expand Down Expand Up @@ -82,51 +83,51 @@ New alias creation failed for 127.0.0.1, err: open : no such file or directory
compression = none
Connecting to 127.0.0.1:50051
gRPC headers from host 127.0.0.1:50051
content-type: [application/grpc]
jtisim: [yes]
content-type: [application/grpc]
Receiving telemetry data from 127.0.0.1:50051

+------------------------------+--------------------+--------------------+--------------------+--------------------+
| Timestamp | KV | Packets | Bytes | Bytes(wire) |
+------------------------------+--------------------+--------------------+--------------------+--------------------+
| Fri May 31 02:23:21 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:04 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:23 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:06 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:25 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:08 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:27 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:10 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:29 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:12 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:31 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:14 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:33 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:16 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:35 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:18 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:37 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:20 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:39 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:22 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:41 PDT 2024 | 5940 | 120 | 262258 | 262858 |
| Tue Jun 25 11:39:24 PDT 2024 | 5940 | 120 | 262258 | 262858 |


| Fri May 31 02:23:43 PDT 2024 | 5940 | 120 | 262258 | 262858 |
| Tue Jun 25 11:39:26 PDT 2024 | 5940 | 120 | 262258 | 262858 |



Collector Stats for 127.0.0.1:50051 (Run time : 25.002534292s)
Collector Stats for 127.0.0.1:50051 (Run time : 25.001662209s)
120 : in-packets
5940 : data points (KV pairs)
25 : in-header wirelength (bytes)
Expand Down
29 changes: 15 additions & 14 deletions tests/data/juniper-junos/config/jtisim-interfaces-2.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Running config of JTIMON:
"internal-jtimon": {
"data-log-file": "",
"csv-log-file": "",
"csv-stats": false
"gnmi-eos": false,
"pre-gnmi-eos": false
},
"paths": [
{
Expand Down Expand Up @@ -89,44 +90,44 @@ Receiving telemetry data from 127.0.0.1:50051
+------------------------------+--------------------+--------------------+--------------------+--------------------+
| Timestamp | KV | Packets | Bytes | Bytes(wire) |
+------------------------------+--------------------+--------------------+--------------------+--------------------+
| Fri May 31 02:23:21 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:04 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:23 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:06 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:25 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:08 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:27 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:10 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:29 PDT 2024 | 1980 | 40 | 87418 | 87618 |
| Tue Jun 25 11:39:12 PDT 2024 | 1980 | 40 | 87418 | 87618 |


| Fri May 31 02:23:31 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:14 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:33 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:16 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:35 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:18 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:37 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:20 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:39 PDT 2024 | 3960 | 80 | 174838 | 175238 |
| Tue Jun 25 11:39:22 PDT 2024 | 3960 | 80 | 174838 | 175238 |


| Fri May 31 02:23:41 PDT 2024 | 5940 | 120 | 262258 | 262858 |
| Tue Jun 25 11:39:24 PDT 2024 | 5940 | 120 | 262258 | 262858 |


| Fri May 31 02:23:43 PDT 2024 | 5940 | 120 | 262258 | 262858 |
| Tue Jun 25 11:39:26 PDT 2024 | 5940 | 120 | 262258 | 262858 |



Collector Stats for 127.0.0.1:50051 (Run time : 25.00119025s)
Collector Stats for 127.0.0.1:50051 (Run time : 25.000787458s)
120 : in-packets
5940 : data points (KV pairs)
25 : in-header wirelength (bytes)
Expand Down
Loading