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

Jump to bottom

Add mapping for munin and options to override service type and name #10322

Merged
merged 13 commits into from
Jan 31, 2019
Merged

Add mapping for munin and options to override service type and name #10322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
965ae7d
Ensure all munin metrics are mapped to double
jsoriano Jan 24, 2019
3783213
Put munin metrics under `munin.metrics`
jsoriano Jan 25, 2019
68841a3
Replace namespace option with service.type and service.name
jsoriano Jan 25, 2019
85208b1
Merge remote-tracking branch 'origin/master' into munin-fields
jsoriano Jan 25, 2019
81fc075
Add missing file
jsoriano Jan 25, 2019
32fed9c
Make hound ci happier
jsoriano Jan 25, 2019
b0223c7
Generate an event per plugin, optionally sanitize field names
jsoriano Jan 29, 2019
0a29aa1
Merge remote-tracking branch 'origin/master' into munin-fields
jsoriano Jan 29, 2019
72932fa
Fix changelog
jsoriano Jan 29, 2019
5427e78
Fix typo
jsoriano Jan 29, 2019
aa1c230
Add note about removal of namespace
jsoriano Jan 30, 2019
d6d437f
Merge remote-tracking branch 'origin/master' into munin-fields
jsoriano Jan 30, 2019
b122bc9
Update x-pack metricbeat
jsoriano Jan 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
7 changes: 5 additions & 2 deletions metricbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16947,12 +16947,15 @@ Munin node metrics exporter



[float]
== munin fields
*`munin.*`*::
+
--
type: object

munin contains metrics exposed by a munin node agent


--

[[exported-fields-mysql]]
== MySQL fields
Expand Down
6 changes: 4 additions & 2 deletions metricbeat/module/munin/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
Munin node metrics exporter
release: beta
fields:
- name: munin
type: group
- name: munin.*
Copy link
Contributor

Choose a reason for hiding this comment

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

you can remove the .* part, it seems that's how we normally do it in fields.yml, the timeseries.instance code will be easier too

Copy link
Member Author

Choose a reason for hiding this comment

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

This looks needed in this case, maybe because I am setting up dynamic templates for two levels now.

type: object
object_type: double
object_type_mapping_type: 'long'
Copy link
Contributor

Choose a reason for hiding this comment

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

why long here? I would perhaps expect:
object_type_mapping_type: "*"

Copy link
Member Author

Choose a reason for hiding this comment

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

I needed objects to keep being objects, I have added two patterns now, one for the level of groups and another one for the metrics.

description: >
munin contains metrics exposed by a munin node agent
fields:
2 changes: 1 addition & 1 deletion metricbeat/module/munin/fields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.