diff --git a/protofiles/BaseConfMsg.proto b/protofiles/BaseConfMsg.proto index 27e8d5ff430bf..a889880a187f2 100644 --- a/protofiles/BaseConfMsg.proto +++ b/protofiles/BaseConfMsg.proto @@ -9,10 +9,12 @@ message BaseConf { optional string pcapBufferSize = 9; optional string pcapInterface = 10; optional string dpiHalfSessions = 11; - optional string packetSendQueueSize = 13; - optional string packetRecvQueueSize = 14; - optional string dpiMsgSendQueueSize = 15; - optional string dpiMsgRecvQueueSize = 16; + optional string packetSendQueueSize = 12; + optional string packetRecvQueueSize = 13; + optional string dpiMsgSendQueueSize = 14; + optional string dpiMsgRecvQueueSize = 15; + optional string syslogSendQueueSize = 16; + optional string syslogRecvQueueSize = 17; optional string qosmosDebugModeEnabled = 18; optional string qosmos64BytePool = 19; optional string qosmos128BytePool = 20; @@ -35,5 +37,9 @@ message BaseConf { optional string captureMemoryLimit = 39; optional string captureMaxPackets = 41; optional string captureIndividualFileLimit = 42; + optional string dpiMaxFree = 43; + optional string dpiMinFree = 44; + optional string dpiFreeThreshold = 45; + optional string dpiRecycleThreshold = 46; } diff --git a/protofiles/CommandRequest.proto b/protofiles/CommandRequest.proto index ebd5060901900..53a0140002220 100644 --- a/protofiles/CommandRequest.proto +++ b/protofiles/CommandRequest.proto @@ -11,6 +11,7 @@ message CommandRequest { NETWORK_CONFIG = 3; NTP_CONFIG = 4; SHUTDOWN = 5; + DRIVEINFO = 6; } required CommandType type = 1; optional string stringArgOne = 2; diff --git a/protofiles/DriveInfo.proto b/protofiles/DriveInfo.proto new file mode 100644 index 0000000000000..0c3428b243734 --- /dev/null +++ b/protofiles/DriveInfo.proto @@ -0,0 +1,28 @@ +package protoMsg; + +option java_package = "com.logrhythm.nm.message"; +option java_outer_classname = "DriveInfoMsg"; + +message DrivesInfo { + message DriveInfo { + + message Partition { + optional uint32 number = 1 [default = 0]; + optional uint64 startInB = 2 [default = 0]; + optional uint64 endInB = 3 [default = 0]; + optional uint64 sizeInB = 4 [default = 0]; + optional string type = 5; + optional string fileSystem = 6; + optional string flags = 7; + } + optional string model = 1; + optional string device = 2; + optional uint64 capacityInB = 3 [default = 0]; + repeated Partition partitions = 4; + optional string table = 5; + + } + + repeated DriveInfo drives = 1; + +} diff --git a/protofiles/SyslogConfMsg.proto b/protofiles/SyslogConfMsg.proto index 9f0082ab0077f..9ef0204a8192e 100644 --- a/protofiles/SyslogConfMsg.proto +++ b/protofiles/SyslogConfMsg.proto @@ -5,12 +5,12 @@ option java_outer_classname = "SyslogConfMsg"; message SyslogConf { optional string syslogEnabled = 1; - optional string syslogLogAgentIP = 2; - optional string syslogLogAgentPort = 3; - optional string syslogMaxLineLength = 4; - optional string siemLogging = 5; - optional string debugSiemLogging = 6; - optional string scrubPasswords = 7; + optional string syslogTcpEnabled = 2; + optional string syslogLogAgentIP = 3; + optional string syslogLogAgentPort = 4; + optional string syslogMaxLineLength = 5; + optional string siemLogging = 6; + optional string debugSiemLogging = 7; + optional string scrubPasswords = 8; optional string reportEverything = 99; } - diff --git a/scripts/buildProtoFiles.sh b/scripts/buildProtoFiles.sh index f490c2b4739f9..9bf7ec3eca357 100755 --- a/scripts/buildProtoFiles.sh +++ b/scripts/buildProtoFiles.sh @@ -63,6 +63,7 @@ cd "$cppSrcDir" "$protoc" -I="$protoFileDir" --cpp_out=libcommand "$protoFileDir"/CommandReply.proto "$protoc" -I="$protoFileDir" --cpp_out=libprocess "$protoFileDir"/ProcessRequest.proto "$protoc" -I="$protoFileDir" --cpp_out=libprocess "$protoFileDir"/ProcessReply.proto +"$protoc" -I="$protoFileDir" --cpp_out=libcommand "$protoFileDir"/DriveInfo.proto mv liblrdpi/DpiMsgLRproto.pb.cc liblrdpi/DpiMsgLRproto.pb.cpp mv liblrdpi/Applications.pb.cc liblrdpi/Applications.pb.cpp mv libstats/StatsMsg.pb.cc libstats/StatsMsg.pb.cpp @@ -81,6 +82,7 @@ mv libcommand/CommandRequest.pb.cc libcommand/CommandRequest.pb.cpp mv libcommand/CommandReply.pb.cc libcommand/CommandReply.pb.cpp mv libprocess/ProcessRequest.pb.cc libprocess/ProcessRequest.pb.cpp mv libprocess/ProcessReply.pb.cc libprocess/ProcessReply.pb.cpp +mv libcommand/DriveInfo.pb.cc libcommand/DriveInfo.pb.cpp cd "$startDir" mkdir -p "$phpSrcDir"