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

Collect the overlay module metrics #59

Merged
merged 3 commits into from
Jul 11, 2019
Merged

Collect the overlay module metrics #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33b7717
Collect the overlay module metrics
Jul 4, 2019
b21ac95
Provide links to source files where metrics are defined
Jul 10, 2019
3c1c4fb
Do not even attempt to tag overlay metrics
Jul 10, 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
34 changes: 33 additions & 1 deletion plugins/inputs/mesos/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ For more information, please check the [Mesos Observability Metrics](http://meso
"evqueue",
"registrar",
"allocator",
"overlay",
]
## A list of Mesos slaves, default is []
# slaves = []
Expand All @@ -37,6 +38,7 @@ For more information, please check the [Mesos Observability Metrics](http://meso
# "executors",
# "tasks",
# "messages",
# "overlay",
# ]
## The user agent to send with requests
user_agent = "Telegraf-mesos"
Expand Down Expand Up @@ -306,6 +308,23 @@ Mesos master metric groups
- allocator/resources/mem/offered_or_allocated
- allocator/resources/mem/total

- [overlay](https://github.com/dcos/dcos-mesos-modules/blob/master/overlay/master_metrics.hpp)
- overlay/master/process_restarts
- overlay/master/log/ensemble_size
- overlay/master/log/recovered
- overlay/master/recovering
- overlay/master/ip_allocation_failures
- overlay/master/ip6_allocation_failures
- overlay/master/subnet_allocation_failures
- overlay/master/subnet6_allocation_failures
- overlay/master/bridge_allocation_failures
- overlay/master/internal/register_agent_messages_received
- overlay/master/internal/register_agent_messages_dropped
- overlay/master/internal/update_agent_overlays_messages_sent
- overlay/master/internal/agent_registered_messages_received
- overlay/master/internal/agent_registered_messages_dropped
- overlay/master/internal/agent_registered_acknowledgements_sent

Mesos slave metric groups
- resources
- slave/cpus_percent
Expand Down Expand Up @@ -372,6 +391,20 @@ Mesos slave metric groups
- slave/valid_framework_messages
- slave/valid_status_updates

- [overlay](https://github.com/dcos/dcos-mesos-modules/blob/master/overlay/agent_metrics.hpp)
- overlay/slave/registering
- overlay/slave/overlay_config_failed
- overlay/slave/overlay_config_failures
- overlay/slave/overlays_without_subnets
- overlay/slave/docker_cmd_failures
- overlay/slave/internal/register_agent_messages_sent
- overlay/slave/internal/update_agent_overlays_messages_received
- overlay/slave/internal/update_agent_overlays_messages_dropped
- overlay/slave/internal/agent_registered_messages_sent
- overlay/slave/internal/agent_registered_messages_dropped
- overlay/slave/internal/agent_registered_acknowledgements_received
- overlay/slave/internal/agent_registered_acknowledgements_dropped

### Tags:

- All master/slave measurements have the following tags:
Expand Down Expand Up @@ -404,4 +437,3 @@ master/mem_revocable_used=0,master/mem_total=1002,
master/mem_used=0,master/messages_authenticate=0,
master/messages_deactivate_framework=0 ...
```

50 changes: 46 additions & 4 deletions plugins/inputs/mesos/mesos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ func (tf TaggedField) tags() fieldTags {
}

var allMetrics = map[Role][]string{
MASTER: {"resources", "master", "system", "agents", "frameworks", "framework_offers", "tasks", "operations", "messages", "evqueue", "registrar", "allocator"},
SLAVE: {"resources", "agent", "system", "executors", "tasks", "messages"},
MASTER: {"resources", "master", "system", "agents", "frameworks", "framework_offers", "tasks", "operations", "messages", "evqueue", "registrar", "allocator", "overlay"},
SLAVE: {"resources", "agent", "system", "executors", "tasks", "messages", "overlay"},
}

var sampleConfig = `
Expand All @@ -139,6 +139,7 @@ var sampleConfig = `
"evqueue",
"registrar",
"allocator",
"overlay",
]
## A list of Mesos slaves, default is []
# slaves = []
Expand All @@ -150,6 +151,7 @@ var sampleConfig = `
# "executors",
# "tasks",
# "messages",
# "overlay",
# ]
## The user agent to send with requests
user_agent = "Telegraf-mesos"
Expand Down Expand Up @@ -559,6 +561,25 @@ func getMetrics(role Role, group string) []string {
"registrar/state_store_ms/p999",
"registrar/state_store_ms/p9999",
}

// https://github.com/dcos/dcos-mesos-modules/blob/master/overlay/master_metrics.hpp
m["overlay"] = []string{
"overlay/master/process_restarts",
"overlay/master/log/ensemble_size",
"overlay/master/log/recovered",
"overlay/master/recovering",
"overlay/master/ip_allocation_failures",
"overlay/master/ip6_allocation_failures",
"overlay/master/subnet_allocation_failures",
"overlay/master/subnet6_allocation_failures",
"overlay/master/bridge_allocation_failures",
"overlay/master/internal/register_agent_messages_received",
"overlay/master/internal/register_agent_messages_dropped",
"overlay/master/internal/update_agent_overlays_messages_sent",
"overlay/master/internal/agent_registered_messages_received",
"overlay/master/internal/agent_registered_messages_dropped",
"overlay/master/internal/agent_registered_acknowledgements_sent",
}
} else if role == SLAVE {
m["resources"] = []string{
"slave/cpus_percent",
Expand Down Expand Up @@ -630,6 +651,22 @@ func getMetrics(role Role, group string) []string {
"slave/valid_framework_messages",
"slave/valid_status_updates",
}

// https://github.com/dcos/dcos-mesos-modules/blob/master/overlay/agent_metrics.hpp
m["overlay"] = []string{
"overlay/slave/registering",
"overlay/slave/overlay_config_failed",
"overlay/slave/overlay_config_failures",
"overlay/slave/overlays_without_subnets",
"overlay/slave/docker_cmd_failures",
"overlay/slave/internal/register_agent_messages_sent",
"overlay/slave/internal/update_agent_overlays_messages_received",
"overlay/slave/internal/update_agent_overlays_messages_dropped",
"overlay/slave/internal/agent_registered_messages_sent",
"overlay/slave/internal/agent_registered_messages_dropped",
"overlay/slave/internal/agent_registered_acknowledgements_received",
"overlay/slave/internal/agent_registered_acknowledgements_dropped",
}
}

ret, ok := m[group]
Expand Down Expand Up @@ -782,7 +819,8 @@ func (m *Mesos) gatherMainMetrics(u *url.URL, role Role, acc telegraf.Accumulato
extraTags := map[string]fieldTags{}

for metricName, val := range jf.Fields {
if !strings.HasPrefix(metricName, "master/frameworks/") && !strings.HasPrefix(metricName, "allocator/") {
if !strings.HasPrefix(metricName, "master/frameworks/") &&
!strings.HasPrefix(metricName, "allocator/") {
continue
}

Expand All @@ -794,8 +832,12 @@ func (m *Mesos) gatherMainMetrics(u *url.URL, role Role, acc telegraf.Accumulato
}

parts := strings.Split(metricName, "/")
if (parts[0] == "master" && len(parts) < 5) || (parts[0] == "allocator" && len(parts) <= 5) {

if parts[0] == "master" && len(parts) < 5 {
// All framework offers metrics have at least 5 parts.
continue
}
if parts[0] == "allocator" && len(parts) <= 5 {
// All allocator metrics with <= 5 parts can be sent as is and does not pull
// any params out into tags.
// (e.g. allocator/mesos/allocation_run_ms/count vs allocator/mesos/roles/<role>/shares/dominant)
Expand Down
29 changes: 29 additions & 0 deletions plugins/inputs/mesos/mesos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,22 @@ func generateMetrics() {
"allocator/mesos/resources/mem/offered_or_allocated",
"allocator/mesos/resources/mem/total",
"allocator/mesos/unknown/unknown/unknown/unknown", // test case for unknown metric type
// overlay
"overlay/master/process_restarts",
"overlay/master/log/ensemble_size",
"overlay/master/log/recovered",
"overlay/master/recovering",
"overlay/master/ip_allocation_failures",
"overlay/master/ip6_allocation_failures",
"overlay/master/subnet_allocation_failures",
"overlay/master/subnet6_allocation_failures",
"overlay/master/bridge_allocation_failures",
"overlay/master/internal/register_agent_messages_received",
"overlay/master/internal/register_agent_messages_dropped",
"overlay/master/internal/update_agent_overlays_messages_sent",
"overlay/master/internal/agent_registered_messages_received",
"overlay/master/internal/agent_registered_messages_dropped",
"overlay/master/internal/agent_registered_acknowledgements_sent",
}

for _, k := range metricNames {
Expand Down Expand Up @@ -347,6 +363,19 @@ func generateMetrics() {
"slave/invalid_status_updates",
"slave/valid_framework_messages",
"slave/valid_status_updates",
// overlay
"overlay/slave/registering",
"overlay/slave/overlay_config_failed",
"overlay/slave/overlay_config_failures",
"overlay/slave/overlays_without_subnets",
"overlay/slave/docker_cmd_failures",
"overlay/slave/internal/register_agent_messages_sent",
"overlay/slave/internal/update_agent_overlays_messages_received",
"overlay/slave/internal/update_agent_overlays_messages_dropped",
"overlay/slave/internal/agent_registered_messages_sent",
"overlay/slave/internal/agent_registered_messages_dropped",
"overlay/slave/internal/agent_registered_acknowledgements_received",
"overlay/slave/internal/agent_registered_acknowledgements_dropped",
}

for _, k := range metricNames {
Expand Down