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

[Metricbeat] Update Ceph module to support new API #16254

Merged
merged 41 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
bb81640
Ceph: docker image for nautilus
Feb 5, 2020
2ad3479
Expose Prometheus port
Feb 6, 2020
4ca3dea
Fix: expose missing port
Feb 6, 2020
d6338b0
Rename docker service
Feb 7, 2020
fd38f16
Boilerplate code for mgr_cluster_health
Feb 8, 2020
8652b6f
Use light module
Feb 8, 2020
02bda67
Strip fields
Feb 9, 2020
965e481
Ceph: add mgr_cluster_disk metricset
Feb 10, 2020
9c42f10
Ceph: add mgr_osd_disk metricset
Feb 10, 2020
61dee28
Ceph: add mgr_osd_* metricsets
Feb 10, 2020
18dc228
Update doc
Feb 10, 2020
6d8f9ad
Update metricset docs
Feb 10, 2020
1fcef89
Update module config
Feb 10, 2020
1a3ee03
Fix: comment
Feb 10, 2020
5444bff
Fix: fields.go
Feb 10, 2020
e011b62
Implement basic Python system test
Feb 11, 2020
539bb3e
Add system test
Feb 11, 2020
6a5ce30
Update data.json
Feb 12, 2020
15a34b9
Update data.json
Feb 12, 2020
ed6f587
Remove field with custom structs
Feb 12, 2020
46dc360
Update data.json
Feb 12, 2020
26f1c47
Use event processors
Feb 12, 2020
2cd1056
Update data.json
Feb 12, 2020
809277c
Fields.yml: mgr_cluster_disk
Feb 12, 2020
c63294b
Fields: mgr_cluster_health in progress
Feb 12, 2020
516b4d5
Fields: mgr_cluster_health
Feb 12, 2020
7021045
Update fields.go
Feb 12, 2020
252fec2
Update fields.yml
Feb 12, 2020
e8c1712
mgr_cluster_disk as standard metricset
Feb 13, 2020
4939ca2
mgr_cluster_health as standard metricset
Feb 13, 2020
e53af7e
mgr_osd_disk as standard metricset
Feb 13, 2020
3b6982e
mgr_osd_perf as standard metricset
Feb 13, 2020
e56f176
mgr_osd_... as standard metricset
Feb 13, 2020
1521de3
Update source after code review
Feb 17, 2020
cd07292
Fix: unit tests
Feb 17, 2020
4e6adb7
Fix: integration-tests
Feb 17, 2020
a672525
Adjust source after code review
Feb 18, 2020
f9e222d
Fix windows: too long path
Feb 18, 2020
481ff0a
Fix
Feb 18, 2020
0672054
Another review round
Feb 18, 2020
b1550b7
Define fields only in original metricset
Feb 18, 2020
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
7 changes: 7 additions & 0 deletions libbeat/tests/compose/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ type UpOptions struct {
// use to advertise itself to clients
SetupAdvertisedHostEnvFile bool
SetupAdvertisedHostEnvFilePort int

Environment []string
}

// UpOption is a modifier for UpOptions
Expand All @@ -71,6 +73,11 @@ func UpWithAdvertisedHostEnvFileForPort(port int) UpOption {
}
}

// UpWithEnvironmentVariable adds environment variable.
func UpWithEnvironmentVariable(keyValue string) UpOption {
return func(options *UpOptions) { options.Environment = append(options.Environment, keyValue) }
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be needed at the end, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. Removed entire feature.


// Filter options for services
type Filter struct {
State State
Expand Down
6 changes: 6 additions & 0 deletions libbeat/tests/compose/wrapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@ func (d *wrapperDriver) Up(ctx context.Context, opts UpOptions, service string)
args = append(args, "--force-recreate")
}

if len(opts.Environment) > 0 {
for _, keyValue := range opts.Environment {
d.Environment = append(d.Environment, keyValue)
}
}

if service != "" {
args = append(args, service)
}
Expand Down
Loading