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.

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

[libbeat] AWS ELB Monitoring #12401

Merged
merged 78 commits into from
Jul 30, 2019
Merged
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
72894c5
Unify heartbeat jobs and tasks for simplicity
andrewvc Nov 14, 2018
ab4a73d
AWS Autodisco
andrewvc Oct 17, 2018
d0bdd60
checkpoint
andrewvc Nov 15, 2018
2c69797
Everything is a job
andrewvc Nov 16, 2018
5e223ba
Improve job types
andrewvc Nov 16, 2018
c54f02d
Checkpoint
andrewvc Nov 16, 2018
53b53e0
Checkpoint
andrewvc Nov 16, 2018
f83d586
CHECKPOINT
andrewvc Nov 16, 2018
3735992
checkpoint
andrewvc Nov 19, 2018
3a27a98
Merge remote-tracking branch 'origin/master' into auto-elb
andrewvc Jun 3, 2019
885eda8
Fix govendor
andrewvc Jun 3, 2019
900b2fd
Fix govendor
andrewvc Jun 3, 2019
9694836
Updates
andrewvc Jun 3, 2019
e5db213
Autodisco sorta works
andrewvc Jun 4, 2019
338afdc
moar
andrewvc Jun 6, 2019
d7b7982
Actually handle additional listeners
andrewvc Jun 6, 2019
2173a3e
More cleanup
andrewvc Jun 6, 2019
48285fa
Support custom access key
andrewvc Jun 7, 2019
64b2d60
Moar
andrewvc Jun 7, 2019
7de2b77
Improve asciidocs
andrewvc Jun 7, 2019
eda8ef2
Revert heartbeat yml
andrewvc Jun 7, 2019
9e7fd30
Fix authentication_failure event.type for security module (#12393)
andrewkroh Jun 3, 2019
381e161
Hardcode namespace for prometheus metrics (#12400)
jsoriano Jun 3, 2019
e98297f
Add documentation for Winlogbeat modules (#12361)
andrewkroh Jun 3, 2019
5298de2
Fix references to `beat.timezone` in docs (#12399)
jsoriano Jun 3, 2019
4c7dab9
Parse the timezone in PostgreSQL logs as part of the date (#12338)
jsoriano Jun 3, 2019
9b62b34
Timeouts on calls to docker api (#12310)
marqc Jun 4, 2019
b43d8cf
Add operating system from vsphere to 'os' field (#12391)
jsoriano Jun 4, 2019
bc22929
Un-skip flaky tests (#12388)
ycombinator Jun 4, 2019
023a46c
Load configuration from modules.d when running setup subcommand (#12340)
kvch Jun 4, 2019
c401af9
[Metricbeat] Decrease timeout time of compose.EnsureUp functions (#10…
sayden Jun 4, 2019
31f72d0
Mark Cisco and PANW modules as beta (#12426)
adriansr Jun 4, 2019
07de1e3
Validate stack modules' metricsets when xpack.enabled = true (#12386)
ycombinator Jun 4, 2019
4e5f001
Fix a typo in kubernetes deploy readme files (#12413)
Jun 4, 2019
05b42a6
Ensure Pod UID is always present in `pod` metricset (#12345)
Jun 4, 2019
26c87ba
[dev guide] Add docs on optional schema arguments (#12371)
fearful-symmetry Jun 5, 2019
f9ad369
Update filebeat EnvoyProxy module README file to reflect the changes …
Jun 5, 2019
1e9ecca
Update CoreDNS module README file to reflect the changes to autodisco…
Jun 5, 2019
1f00ab3
Revert "Enforce presence of Certificate Authorities, Certificate file…
ph Jun 5, 2019
4fc44ee
Govendor ECS 1.0.1 (#12317)
Jun 5, 2019
06d3f08
Don't duplicate @timestamp to beat.Event's Fields (#12449)
andrewkroh Jun 5, 2019
a23a8b7
migrate the system module to reporterV2 with error return, part one (…
fearful-symmetry Jun 6, 2019
338fabb
Remove `convert_timezone` option from filebeat system module (#12410)
jsoriano Jun 6, 2019
03752cd
Export Kibana Client's Transport and Version (#12422)
jalvz Jun 7, 2019
89cab2f
Fix 11975 - change Kubernetes container cpu cores fields to float (#1…
easkay Jun 7, 2019
0f883d1
[Heartbeat] Fix Continuation Dispatch / mode: all pings (#12458)
andrewvc Jun 7, 2019
c449d3c
Remove ECS from aws dashboard names (#12471)
kaiyan-sheng Jun 7, 2019
e5b8a8c
A variety of improvements
andrewvc Jun 7, 2019
e0202ec
Add ELB Listener fields
andrewvc Jun 12, 2019
1b078e4
Merge remote-tracking branch 'origin/master' into auto-elb
andrewvc Jun 12, 2019
462d0de
Revert accidental notice change
andrewvc Jun 12, 2019
ceedb5b
Incorporate PR feedback
andrewvc Jun 13, 2019
dce76e4
Incorporate PR feedback
andrewvc Jun 13, 2019
f5d8a69
Improve fields
andrewvc Jun 13, 2019
11ab929
Update all vendored imports
andrewvc Jun 14, 2019
0a1ba5a
Merge remote-tracking branch 'origin/master' into auto-elb
andrewvc Jun 17, 2019
d8e7230
Reset vendor to master
andrewvc Jun 17, 2019
555fd32
Merge remote-tracking branch 'origin/master' into auto-elb
andrewvc Jul 23, 2019
adf4d23
Update
andrewvc Jul 23, 2019
3817d9b
Update
andrewvc Jul 23, 2019
c279606
Incorporate PR feedback
andrewvc Jul 24, 2019
7242238
Merge remote-tracking branch 'origin/master' into auto-elb
andrewvc Jul 24, 2019
0d075ec
Incorporate PR feedback
andrewvc Jul 24, 2019
282cec2
Add timeout equal to interval
andrewvc Jul 24, 2019
7056db5
Incorporate PR feedback
andrewvc Jul 24, 2019
563e85d
Various improvements
andrewvc Jul 25, 2019
d35e091
Improve docs
andrewvc Jul 25, 2019
a5340f1
Fix whitespace
andrewvc Jul 25, 2019
ee5fdde
Merge remote-tracking branch 'origin/master' into auto-elb
andrewvc Jul 25, 2019
aa019c3
Fix test race
andrewvc Jul 29, 2019
bf2904e
Fix detected races
andrewvc Jul 29, 2019
7a6f151
Merge remote-tracking branch 'origin/master' into auto-elb
andrewvc Jul 29, 2019
431c5f6
Fix detected races
andrewvc Jul 29, 2019
9a53417
Make timeouts more lax
andrewvc Jul 29, 2019
0af6bd4
Fix docs
andrewvc Jul 29, 2019
f8683a0
Fix docs
andrewvc Jul 29, 2019
e120361
Just make the docs work for now
andrewvc Jul 30, 2019
abfb978
Don't leave in broken docs
andrewvc Jul 30, 2019
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
Prev Previous commit
Next Next commit
Don't duplicate @timestamp to beat.Event's Fields (#12449)
When utilizing `PutValue()` to write `@timestamp` the value was being written to both the internal `Timestamp` field and copied to the `Fields` mapstr. When the event is output this causes duplicate `@timestamp` fields in the JSON.

This fixes that issue and by making `PutValue` only set the internal `Timestamp` field.
  • Loading branch information
andrewkroh authored and andrewvc committed Jun 12, 2019
commit 06d3f08cd371abfb406527fbb0e80b20b87e294f
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
@@ -80,6 +80,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix of docker json parser for missing "log" jsonkey in docker container's log {issue}11464[11464]
- Fixed Beat ID being reported by GET / API. {pull}12180[12180]
- Add host.os.codename to fields.yml. {pull}12261[12261]
- Fix `@timestamp` being duplicated in events if `@timestamp` is set in a
processor (or by any code utilizing `PutValue()` on a `beat.Event`).

*Auditbeat*

1 change: 1 addition & 0 deletions libbeat/beat/event.go
Original file line number Diff line number Diff line change
@@ -76,6 +76,7 @@ func (e *Event) PutValue(key string, v interface{}) (interface{}, error) {
default:
return nil, errNoTimestamp
}
return nil, nil
} else if subKey, ok := metadataKey(key); ok {
if subKey == "" {
switch meta := v.(type) {
4 changes: 2 additions & 2 deletions libbeat/beat/event_test.go
Original file line number Diff line number Diff line change
@@ -44,8 +44,8 @@ func TestEventPutGetTimestamp(t *testing.T) {
assert.Equal(t, ts, v)
assert.Equal(t, ts, evt.Timestamp)

// The @timestamp is also written into Fields.
assert.Equal(t, ts, evt.Fields["@timestamp"])
// The @timestamp is not written into Fields.
assert.Nil(t, evt.Fields["@timestamp"])
}

func TestEventMetadata(t *testing.T) {
9 changes: 6 additions & 3 deletions x-pack/winlogbeat/module/testing_windows.go
Original file line number Diff line number Diff line change
@@ -125,9 +125,12 @@ func testPipeline(t testing.TB, evtx string, pipeline string, p *params) {
t.Fatalf("%v while processing event:\n%v", err, record.Fields.StringToPrint())
}

// Ensure timezone is UTC. In the normal Beats output this is handled
// by the encoder (go-structform).
evt.PutValue("@timestamp", evt.Timestamp.UTC())
// Copy the timestamp to the beat.Event.Fields because this is what
// we write to the golden data for testing purposes. In the normal
// Beats output this the handled by the encoder (go-structform).
if !evt.Timestamp.IsZero() {
evt.Fields["@timestamp"] = evt.Timestamp.UTC()
}

events = append(events, filterEvent(evt.Fields, p.ignoreFields))
}