Skip to content

Commit

Permalink
Add tag annotation/stats to NodeStatus.{system_mem_cpu_usage,process_…
Browse files Browse the repository at this point in the history 
…mem_cpu_usage}

- Add tag annotation
- Send as stats
- UT using various combinations of select/where
contrail-stats --table NodeStatus.process_mem_cpu_usage --select name process_mem_cpu_usage.module_id   \
                                                                      process_mem_cpu_usage.inst_id     \
                                                                      process_mem_cpu_usage.mem_virt    \
                                                                      process_mem_cpu_usage.cpu_share   \
                                                                      process_mem_cpu_usage.mem_res     \
                                                        --where "process_mem_cpu_usage.module_id=contrail-config-nodemgr AND process_mem_cpu_usage.cpu_share=0"
contrail-stats --table NodeStatus.process_mem_cpu_usage --select name process_mem_cpu_usage.module_id   \
                                                        --where "process_mem_cpu_usage.module_id|process_mem_cpu_usage.inst_id=contrail-config-nodemgr|0"
contrail-stats --table NodeStatus.system_mem_cpu_usage --select name system_mem_cpu_usage.cpu_share                     \
                                                                     system_mem_cpu_usage.cpu_load.one_min_avg          \
                                                                     system_mem_cpu_usage.cpu_load.five_min_avg         \
                                                                     system_mem_cpu_usage.cpu_load.fifteen_min_avg      \
                                                                     system_mem_cpu_usage.mem_info.total                \
                                                                     system_mem_cpu_usage.mem_info.used                 \
                                                                     system_mem_cpu_usage.mem_info.free                 \
                                                                     system_mem_cpu_usage.mem_info.buffers              \
                                                                     system_mem_cpu_usage.mem_info.cached

Change-Id: I14337f46a7e97acdd96e618db392a0eee56476f7
Closes-Bug: 1589614
  • Loading branch information
Santosh Gupta committed Jul 3, 2016
1 parent 9e4bdc2 commit 03cb97c
Show file tree
Hide file tree
Showing 2 changed files with 153 additions and 3 deletions.
152 changes: 151 additions & 1 deletion src/analytics/viz.sandesh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1959,6 +1959,156 @@ const list<stat_table> _STAT_TABLES = [
{ 'name' : 'disk_usage_info.partition_space_available_1k', 'datatype' : 'int', 'index' : false },
]
},
{
'display_name' : 'Analytics Process Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'process_mem_cpu_usage',
'obj_table' : COLLECTOR_INFO_TABLE,
'attributes': [
{ 'name' : 'process_mem_cpu_usage.module_id', 'datatype' : 'string', 'index' : true, 'suffixes': ['process_mem_cpu_usage.inst_id']},
{ 'name' : 'process_mem_cpu_usage.inst_id', 'datatype' : 'string', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.mem_virt', 'datatype' : 'int', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
{ 'name' : 'process_mem_cpu_usage.mem_res', 'datatype' : 'int', 'index' : false },
]
},
{
'display_name' : 'Database Process Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'process_mem_cpu_usage',
'obj_table' : DATABASE_INFO_TABLE,
'attributes': [
{ 'name' : 'process_mem_cpu_usage.module_id', 'datatype' : 'string', 'index' : true, 'suffixes': ['process_mem_cpu_usage.inst_id']},
{ 'name' : 'process_mem_cpu_usage.inst_id', 'datatype' : 'string', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.mem_virt', 'datatype' : 'int', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
{ 'name' : 'process_mem_cpu_usage.mem_res', 'datatype' : 'int', 'index' : false },
]
},
{
'display_name' : 'Config Process Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'process_mem_cpu_usage',
'obj_table' : CONFIG_NODE_TABLE,
'attributes': [
{ 'name' : 'process_mem_cpu_usage.module_id', 'datatype' : 'string', 'index' : true, 'suffixes': ['process_mem_cpu_usage.inst_id']},
{ 'name' : 'process_mem_cpu_usage.inst_id', 'datatype' : 'string', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.mem_virt', 'datatype' : 'int', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
{ 'name' : 'process_mem_cpu_usage.mem_res', 'datatype' : 'int', 'index' : false },
]
},
{
'display_name' : 'Control-node Process Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'process_mem_cpu_usage',
'obj_table' : BGP_ROUTER_TABLE,
'attributes': [
{ 'name' : 'process_mem_cpu_usage.module_id', 'datatype' : 'string', 'index' : true, 'suffixes': ['process_mem_cpu_usage.inst_id']},
{ 'name' : 'process_mem_cpu_usage.inst_id', 'datatype' : 'string', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.mem_virt', 'datatype' : 'int', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
{ 'name' : 'process_mem_cpu_usage.mem_res', 'datatype' : 'int', 'index' : false },
]
},
{
'display_name' : 'Vrouter Process Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'process_mem_cpu_usage',
'obj_table' : VROUTER_TABLE,
'attributes': [
{ 'name' : 'process_mem_cpu_usage.module_id', 'datatype' : 'string', 'index' : true, 'suffixes': ['process_mem_cpu_usage.inst_id']},
{ 'name' : 'process_mem_cpu_usage.inst_id', 'datatype' : 'string', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.mem_virt', 'datatype' : 'int', 'index' : false },
{ 'name' : 'process_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
{ 'name' : 'process_mem_cpu_usage.mem_res', 'datatype' : 'int', 'index' : false },
]
},
{
'display_name' : 'Analytics System Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'system_mem_cpu_usage',
'obj_table' : COLLECTOR_INFO_TABLE,
'attributes': [
{ 'name' : 'system_mem_cpu_usage.mem_info.total', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.used', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.free', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.buffers', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.cached', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.one_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.five_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.fifteen_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
]
},
{
'display_name' : 'Database System Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'system_mem_cpu_usage',
'obj_table' : DATABASE_INFO_TABLE,
'attributes': [
{ 'name' : 'system_mem_cpu_usage.mem_info.total', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.used', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.free', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.buffers', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.cached', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.one_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.five_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.fifteen_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
]
},
{
'display_name' : 'Config System Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'system_mem_cpu_usage',
'obj_table' : CONFIG_NODE_TABLE,
'attributes': [
{ 'name' : 'system_mem_cpu_usage.mem_info.total', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.used', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.free', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.buffers', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.cached', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.one_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.five_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.fifteen_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
]
},
{
'display_name' : 'Control-node System Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'system_mem_cpu_usage',
'obj_table' : BGP_ROUTER_TABLE,
'attributes': [
{ 'name' : 'system_mem_cpu_usage.mem_info.total', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.used', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.free', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.buffers', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.cached', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.one_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.five_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.fifteen_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
]
},
{
'display_name' : 'Vrouter System Memory CPU Usage',
'stat_type' : 'NodeStatus'
'stat_attr' : 'system_mem_cpu_usage',
'obj_table' : VROUTER_TABLE,
'attributes': [
{ 'name' : 'system_mem_cpu_usage.mem_info.total', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.used', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.free', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.buffers', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.mem_info.cached', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.one_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.five_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_load.fifteen_min_avg', 'datatype' : 'int', 'index' : false},
{ 'name' : 'system_mem_cpu_usage.cpu_share', 'datatype' : 'double', 'index' : true},
]
},
{
'display_name' : 'Virtual Machine Floating IP Statistics',
'stat_type' : 'UveVMInterfaceAgent'
Expand Down Expand Up @@ -2071,7 +2221,7 @@ const list<stat_table> _STAT_TABLES = [
]
},
{
'display_name' : 'Routung Instance Information',
'display_name' : 'Routing Instance Information',
'stat_type' : 'RoutingInstanceStatsData',
'stat_attr' : 'table_stats',
'obj_table' : ROUTING_INSTANCE_TABLE,
Expand Down
4 changes: 2 additions & 2 deletions src/base/sandesh/nodeinfo.sandesh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ struct NodeStatus {
7: optional string description
8: optional list<string> all_core_file_list
9: optional string build_info
10: optional list<cpuinfo.ProcessCpuInfo> process_mem_cpu_usage (aggtype="union")
11: optional cpuinfo.SystemMemCpuUsage system_mem_cpu_usage
10: optional list<cpuinfo.ProcessCpuInfo> process_mem_cpu_usage (tags=".module_id:.inst_id,.cpu_share")
11: optional cpuinfo.SystemMemCpuUsage system_mem_cpu_usage(tags=".cpu_share")
12: optional cpuinfo.SystemCpuInfo system_cpu_info
}

Expand Down

0 comments on commit 03cb97c

Please sign in to comment.