Skip to content

Send flavor resources as value metadata #2

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

Merged
merged 4 commits into from
Nov 2, 2017
Merged

Send flavor resources as value metadata #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37e8c8c
Send flavor resources as value metadata
dougszumski Oct 31, 2017
0cb3faf
rebase: Specify value_meta for usage summary
dougszumski Oct 31, 2017
b3b11f9
Fix bug where dimension value is not a string
dougszumski Oct 31, 2017
b468e92
Update metric name in grafana dashboard
dougszumski Nov 1, 2017
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
Empty file modified cron/example.sh
100644 → 100755
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions cron/grafana_dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@
"error": "",
"group": true,
"hide": false,
"metric": "os_capacity.usage.count",
"metric": "os_capacity.usage.user.count",
"period": "300",
"refId": "A"
}
Expand Down Expand Up @@ -502,7 +502,7 @@
],
"error": "",
"group": true,
"metric": "os_capacity.usage.days.count",
"metric": "os_capacity.usage.user.days.count",
"period": "300",
"refId": "A"
}
Expand Down
9 changes: 6 additions & 3 deletions os_capacity/commands/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,16 @@ def take_action(self, parsed_args):
free = group[3]
metrics_to_send.append(metrics.Metric(
name="resources.total", value=total,
dimensions={"flavor": flavors, "resources": resources}))
value_meta={"flavor_resources": resources},
dimensions={"flavor": flavors}))
metrics_to_send.append(metrics.Metric(
name="resources.used", value=used,
dimensions={"flavor": flavors, "resources": resources}))
value_meta={"flavor_resources": resources},
dimensions={"flavor": flavors}))
metrics_to_send.append(metrics.Metric(
name="resources.free", value=free,
dimensions={"flavor": flavors, "resources": resources}))
value_meta={"flavor_resources": resources},
dimensions={"flavor": flavors}))
metrics.send_metrics(self.app.monitoring_client, metrics_to_send)

return (
Expand Down
4 changes: 2 additions & 2 deletions os_capacity/data/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import time

Metric = collections.namedtuple(
"Metric", ("name", "value", "dimensions"))
"Metric", ("name", "value", "value_meta", "dimensions"))

SEND_METRICS = 'OS_CAPACITY_SEND_METRICS' in os.environ

Expand All @@ -33,7 +33,7 @@ def send_metrics(monitoring_client, metrics):
"name": "os_capacity.%s" % metric.name,
"value": float(metric.value),
"timestamp": timestamp,
"value_meta": None,
"value_meta": metric.value_meta,
"dimensions": metric.dimensions,
})
response = monitoring_client.post("/metrics", json=formatted_metrics)
Expand Down
6 changes: 4 additions & 2 deletions os_capacity/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,18 @@ def get_key(allocation):

if key_name:
dimensions[name_key] = key_name
dimensions['usage_summary'] = usage
dimensions['version'] = 2.0
value_meta = {'usage_summary': usage}
dimensions['version'] = '2.0'

metrics_to_send.append(metrics.Metric(
name="usage.%s.count" % group_by,
value=grouped_usage['Count'],
value_meta=value_meta,
dimensions=dimensions))
metrics_to_send.append(metrics.Metric(
name="usage.%s.days.count" % group_by,
value=grouped_usage_days['Count'],
value_meta=value_meta,
dimensions=dimensions))

# Sort my largest current usage first
Expand Down