Changes in controller for dynamic stat table schema

Stat table schemas are auto generated in json formats. With this change, opserver will read the schema from auto generated files Partial-Bug:1584993 Change-Id: I2735edfd99cb29289f1ec20d89121347a981f065
Juniper · Jul 28, 2016 · 3948863 · 3948863
1 parent 8063ea7
commit 3948863
Show file tree

Hide file tree

Showing 25 changed files with 159 additions and 917 deletions.
diff --git a/src/analytics/analytics.sandesh b/src/analytics/analytics.sandesh
@@ -47,6 +47,7 @@ uve sandesh ModuleCpuStateTrace {
 struct  AnalyticsCpuState {
     1: string                                 name (key="ObjectCollectorInfo")
     2: optional bool                          deleted
+    /** @display_name:Analytics CPU Information*/
     3: optional list<cpuinfo.ProcessCpuInfo>  cpu_info (tags=".module_id,.mem_virt,.cpu_share,.mem_res", aggtype="union")
 }
 
@@ -87,6 +88,7 @@ struct QueryStats {
 objectlog sandesh QueryPerfInfo {
     1: string                      name (key="ObjectCollectorInfo")
     3: string                      table
+    /** @display_name:QE Performance*/
     10: QueryStats                 query_stats (tags="table,name:.qid,.rows,.time")
 }
 
@@ -111,6 +113,7 @@ struct AnalyticsApiSample {
  * @object: analytics-node
  */
 objectlog sandesh AnalyticsApiStats {
+    /** @display_name:Analytics API Statistics*/
     1: AnalyticsApiSample api_stats (tags=".operation_type,.remote_ip,.object_type")
 }
 
@@ -131,6 +134,7 @@ struct UserDefinedCounter {
     1: string name (key="UserDefinedCounterTable")
     2: optional bool deleted
     3: optional u64 rx_event (hidden="yes")
+    /** @display_name:User defined counters*/
     4: optional uint64_t_P_ count (stats="rx_event:DSSum:", tags="")
 } (period="60")
 

diff --git a/src/analytics/collector_uve.sandesh b/src/analytics/collector_uve.sandesh
@@ -64,8 +64,11 @@ struct GeneratorInfo {
  */
 objectlog sandesh GeneratorDbStats {
     1: string                             name (key="ObjectGeneratorInfo")
+    /** @display_name:Generator Database Table Statistics*/
     2: optional list<gendb.DbTableInfo>   table_info (tags=".table_name")
+    /** @display_name:Generator Database Errors*/
     3: optional gendb.DbErrors            errors (tags="")
+    /** @display_name:Generator Statistics Database Table*/
     4: optional list<gendb.DbTableInfo>   statistics_table_info (tags=".table_name")
 }
 
@@ -133,9 +136,13 @@ struct CollectorStats {
  */
 objectlog sandesh CollectorDbStats {
     1: string                             name (key="ObjectCollectorInfo")
+    /** @display_name:Collector Database Table Statistics*/
     2: optional list<gendb.DbTableInfo>   table_info (tags=".table_name")
+    /** @display_name:Collector Database Errors*/
     3: optional gendb.DbErrors            errors (tags="")
+    /** @display_name:Collector Statistics Database Table*/
     4: optional list<gendb.DbTableInfo>   statistics_table_info (tags=".table_name")
+    /** @display_name:Collector Database CQL Request Statistics*/
     5: optional cql.DbStats               cql_stats (tags="")
 }
 
@@ -146,11 +153,17 @@ objectlog sandesh CollectorDbStats {
  */
 objectlog sandesh ProtobufCollectorStats {
     1: string                                       name (key="ObjectCollectorInfo")
+    /** @display_name:Analytics Protobuf Collector Receive Socket Statistics*/
     2: optional list<io.SocketIOStats>              rx_socket_stats (tags="")
+    /** @display_name:Analytics Protobuf Collector Transmit Socket Statistics*/
     3: optional list<io.SocketIOStats>              tx_socket_stats (tags="")
+    /** @display_name:Analytics Protobuf Collector Receive Message Statistics*/
     4: optional list<io.SocketEndpointMessageStats> rx_message_stats (tags=".endpoint_name,.message_name")
+    /** @display_name:Analytics Protobuf Collector Database Table*/
     5: optional list<gendb.DbTableInfo>             db_table_info (tags=".table_name")
+    /** @display_name:Analytics Protobuf Collector Database Errors*/
     6: optional list<gendb.DbErrors>                db_errors (tags="")
+    /** @display_name:Analytics Protobuf Collector Statistics Database Table*/
     7: optional list<gendb.DbTableInfo>             db_statistics_table_info (tags=".table_name")
     8: optional u64                                 db_queue_count
     9: optional u64                                 db_enqueues
@@ -317,6 +330,7 @@ struct SandeshMessageInfo {
  */
 objectlog sandesh SandeshMessageStat {
     1: string                            name (key="ObjectGeneratorInfo")
+    /** @display_name:Collector Message Stats*/
     2: optional list<SandeshMessageInfo> msg_info (tags=".type,.level")
 }
 

diff --git a/src/analytics/contrail-broadview/broadview.sandesh b/src/analytics/contrail-broadview/broadview.sandesh
@@ -72,14 +72,24 @@ objectlog sandesh PRouterBroadViewInfo {
     1: string name (key="ObjectPRouter")
     2: string asic_id
     3: Device device
+    /** @display_name:Broadview ingress-port-priority-group*/
     4: list<IngressPortPriorityGroup> ingressPortPriorityGroup (tags="name,asic_id,.port,.priorityGroup")
+    /** @display_name:Broadview ingress-port-service-pool*/
     5: list<IngressPortServicePool> ingressPortServicePool (tags="name,asic_id,.port,.servicePool")
+    /** @display_name:Broadview ingress-service-pool*/
     6: list<IngressServicePool> ingressServicePool (tags="name,asic_id,.servicePool")
+    /** @display_name:Broadview egress-port-service-pool*/
     7: list<EgressPortServicePool> egressPortServicePool (tags="name,asic_id,.port,.servicePool")
+    /** @display_name:Broadview egress-service-pool*/
     8: list<EgressServicePool> egressServicePool (tags="name,asic_id,.servicePool")
+    /** @display_name:Broadview egress-uc-queue*/
     9: list<EgressUcQueue> egressUcQueue (tags="name,asic_id,.queue")
+    /** @display_name:Broadview egress-uc-queue-group*/
    10: list<EgressUcQueueGroup> egressUcQueueGroup (tags="name,asic_id,.queueGroup")
+    /** @display_name:Broadview egress-mc-queue*/
    11: list<EgressMcQueue> egressMcQueue (tags="name,asic_id,.queue")
+    /** @display_name:Broadview egress-cpu-queue*/
    12: list<EgressCpuQueue> egressCpuQueue (tags="name,asic_id,.queue")
+    /** @display_name:Broadview egress-rqe-queue*/
    13: list<EgressRqeQueue> egressRqeQueue (tags="name,asic_id,.queue")
 }
diff --git a/src/analytics/contrail-snmp-collector/prouter.sandesh b/src/analytics/contrail-snmp-collector/prouter.sandesh
@@ -216,6 +216,7 @@ struct PRouterEntry {
     4: optional list<ArpTable> arpTable
     5: optional list<IfTable> ifTable
     6: optional list<IfXTable> ifXTable
+    /** @display_name:Physical Router Interface Statistics*/
     7: optional list<IfStats> ifStats (tags="name:.ifIndex,name:.ifName")
     8: optional list<IpMib> ipMib
     9: optional list<dot1qTpFdbPortTable> fdbPortTable

diff --git a/src/analytics/database/database.sandesh b/src/analytics/database/database.sandesh
@@ -26,6 +26,7 @@ struct DatabaseUsageStats {
 struct DatabaseUsageInfo {
     1: string                              name (key="ObjectDatabaseInfo")
     2: optional bool                       deleted
+    /** @display_name:Database Usage Statistics*/
     3: optional list<DatabaseUsageStats>   database_usage (tags="")
 }
 
@@ -51,7 +52,9 @@ struct CassandraCompactionTask {
 struct CassandraStatusData {
     1: string name (key="ObjectDatabaseInfo")
     2: optional bool deleted
+    /** @display_name:Cassandra Compaction Info*/
     3: CassandraCompactionTask cassandra_compaction_task (tags="")
+    /** @display_name:Cassandra Thread Pool Info*/
     4: list<CassandraThreadPoolStats>  thread_pool_stats (tags=".pool_name")
 }