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

Update Memcache protocol to use ECS fields #10189

Merged
merged 1 commit into from
Jan 21, 2019
Merged

Update Memcache protocol to use ECS fields #10189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Changed NFS protocol fields to align with ECS. {pull}10153[10153]
- Changed Thrift protocol fields to align with ECS. {pull}10125[10125]
- Changed Cassandra protocol fields to align with ECS. {pull}10093[10093]
- Changed Memcache protocol fields to align with ECS. {pull}10189[10189]

*Winlogbeat*

Expand Down
33 changes: 21 additions & 12 deletions packetbeat/protos/applayer/applayer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import (
"github.com/elastic/beats/libbeat/beat"
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/streambuf"

"github.com/elastic/beats/packetbeat/pb"
)

// A Message its direction indicator
Expand Down Expand Up @@ -91,9 +93,8 @@ type Transaction struct {
// Ts sets the transaction its initial timestamp
Ts TransactionTimestamp

// ResponseTime is the transaction duration in milliseconds. Should be set
// to -1 if duration is unknown
ResponseTime int32
// EndTime is the time the transaction ended.
EndTime time.Time

// Status of final transaction
Status string // see libbeat/common/statuses.go
Expand Down Expand Up @@ -222,17 +223,25 @@ func (t *Transaction) InitWithMsg(
func (t *Transaction) Event(event *beat.Event) error {
event.Timestamp = t.Ts.Ts

pbf := &pb.Fields{}
pbf.SetSource(&t.Src)
pbf.SetDestination(&t.Dst)
pbf.Source.Bytes = int64(t.BytesIn)
pbf.Destination.Bytes = int64(t.BytesOut)
pbf.Event.Dataset = t.Type
pbf.Event.Start = t.Ts.Ts
pbf.Event.End = t.EndTime
pbf.Network.Transport = t.Transport.String()
pbf.Network.Protocol = pbf.Event.Dataset

fields := event.Fields
fields["type"] = t.Type
fields["responsetime"] = t.ResponseTime
fields["src"] = &t.Src
fields["dst"] = &t.Dst
fields["transport"] = t.Transport.String()
fields["bytes_out"] = t.BytesOut
fields["bytes_in"] = t.BytesIn
fields[pb.FieldsKey] = pbf
fields["type"] = pbf.Event.Dataset
fields["status"] = t.Status
if len(t.Notes) > 0 {
fields["notes"] = t.Notes
if len(t.Notes) == 1 {
event.PutValue("error.message", t.Notes[0])
} else if len(t.Notes) > 1 {
event.PutValue("error.message", t.Notes)
}
return nil
}
Expand Down
5 changes: 2 additions & 3 deletions packetbeat/protos/memcache/memcache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,18 +351,17 @@ func newTransaction(requ, resp *message) *transaction {
t.Init(requ)
t.BytesOut = requ.Size
t.BytesIn = resp.Size
t.ResponseTime = int32(resp.Ts.Sub(requ.Ts).Nanoseconds() / 1e6) // [ms]
t.EndTime = resp.Ts
t.Notes = append(t.Notes, requ.Notes...)
t.Notes = append(t.Notes, resp.Notes...)
case requ != nil && resp == nil:
t.Init(requ)
t.BytesOut = requ.Size
t.ResponseTime = -1
t.Notes = append(t.Notes, requ.Notes...)
case requ == nil && resp != nil:
t.Init(resp)
t.BytesIn = resp.Size
t.ResponseTime = -1
t.EndTime = resp.Ts
t.Notes = append(t.Notes, resp.Notes...)
}

Expand Down
2 changes: 1 addition & 1 deletion packetbeat/tests/system/test_0040_memcache_tcp_bin_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def assert_common(self, objs):

# check transport layer always tcp
assert all(o['type'] == 'memcache' for o in objs)
assert all(o['transport'] == 'tcp' for o in objs)
assert all(o['network.transport'] == 'tcp' for o in objs)
assert all(o['memcache.protocol_type'] == 'binary' for o in objs)

def test_store_load(self):
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/tests/system/test_0040_memcache_tcp_text_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def assert_common(self, objs):

# check transport layer always tcp
assert all(o['type'] == 'memcache' for o in objs)
assert all(o['transport'] == 'tcp' for o in objs)
assert all(o['network.transport'] == 'tcp' for o in objs)
assert all(o['memcache.protocol_type'] == 'text' for o in objs)

def test_store_load(self):
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/tests/system/test_0041_memcache_udp_bin_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def assert_common(self, objs):

# check transport layer always udp
assert all(o['type'] == 'memcache' for o in objs)
assert all(o['transport'] == 'udp' for o in objs)
assert all(o['network.transport'] == 'udp' for o in objs)
assert all(o['memcache.protocol_type'] == 'binary' for o in objs)

def test_store(self):
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/tests/system/test_0041_memcache_udp_text_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def assert_common(self, objs):

# check transport layer always tcp
assert all(o['type'] == 'memcache' for o in objs)
assert all(o['transport'] == 'udp' for o in objs)
assert all(o['network.transport'] == 'udp' for o in objs)
assert all(o['memcache.protocol_type'] == 'text' for o in objs)

def test_store(self):
Expand Down