Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "change ram util metric"

Browse Source
This commit is contained in:
Jenkins
2017-08-09 06:26:48 +00:00
committed by Gerrit Code Review
parent 9ecd22f4c8 d2f70f9d6f
commit 47004b7c67
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/tests/decision_engine/model/faker_cluster_and_metrics.py
View File

@@ -87,7 +87,7 @@ class FakeCeilometerMetrics(object):
return self.get_node_cpu_util(resource_id)
elif meter_name == "cpu_util":
return self.get_instance_cpu_util(resource_id)
elif meter_name == "memory.usage":
elif meter_name == "memory.resident":
return self.get_instance_ram_util(resource_id)
elif meter_name == "disk.root.size":
return self.get_instance_disk_root_size(resource_id)
@@ -169,7 +169,7 @@ class FakeGnocchiMetrics(object):
return self.get_node_cpu_util(resource_id)
elif metric == "cpu_util":
return self.get_instance_cpu_util(resource_id)
elif metric == "memory.usage":
elif metric == "memory.resident":
return self.get_instance_ram_util(resource_id)
elif metric == "disk.root.size":
return self.get_instance_disk_root_size(resource_id)