projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds granularity support in OpenStack vim config
[osm/MON.git]
/
osm_mon
/
plugins
/
OpenStack
/
Gnocchi
/
metrics.py
diff --git
a/osm_mon/plugins/OpenStack/Gnocchi/metrics.py
b/osm_mon/plugins/OpenStack/Gnocchi/metrics.py
index
a30b732
..
b41b5c0
100644
(file)
--- a/
osm_mon/plugins/OpenStack/Gnocchi/metrics.py
+++ b/
osm_mon/plugins/OpenStack/Gnocchi/metrics.py
@@
-24,21
+24,20
@@
import datetime
import json
import logging
import datetime
import json
import logging
-
import time
import six
import time
import six
+import yaml
from osm_mon.core.message_bus.producer import KafkaProducer
from osm_mon.core.message_bus.producer import KafkaProducer
+from osm_mon.core.settings import Config
from osm_mon.plugins.OpenStack.common import Common
from osm_mon.plugins.OpenStack.common import Common
-
from osm_mon.plugins.OpenStack.response import OpenStack_Response
from osm_mon.plugins.OpenStack.response import OpenStack_Response
-from osm_mon.plugins.OpenStack.settings import Config
log = logging.getLogger(__name__)
METRIC_MAPPINGS = {
log = logging.getLogger(__name__)
METRIC_MAPPINGS = {
- "average_memory_utilization": "memory.
percent
",
+ "average_memory_utilization": "memory.
usage
",
"disk_read_ops": "disk.read.requests",
"disk_write_ops": "disk.write.requests",
"disk_read_bytes": "disk.read.bytes",
"disk_read_ops": "disk.read.requests",
"disk_write_ops": "disk.write.requests",
"disk_read_bytes": "disk.read.bytes",
@@
-78,7
+77,10
@@
class Metrics(object):
def metric_calls(self, message):
"""Consume info from the message bus to manage metric requests."""
def metric_calls(self, message):
"""Consume info from the message bus to manage metric requests."""
- values = json.loads(message.value)
+ try:
+ values = json.loads(message.value)
+ except ValueError:
+ values = yaml.safe_load(message.value)
log.info("OpenStack metric action required.")
auth_token = Common.get_auth_token(values['vim_uuid'])
log.info("OpenStack metric action required.")
auth_token = Common.get_auth_token(values['vim_uuid'])