Add new Network Performance counters

Author: sugr4

installer/conf/omi_mapping.json

@@ -39,6 +39,46 @@
             }
         ]
     },
+    {
+        "CimClassName": "SCX_EthernetPortStatistics",
+        "ObjectName": "Network",
+        "InstanceProperty": "InstanceID",
+        "Namespace": "root/scx",
+        "CimProperties": [
+            {
+                "CimPropertyName": "BytesTransmitted",
+                "CounterName": "Total Bytes Transmitted"
+            },
+            {
+                "CimPropertyName": "BytesReceived",
+                "CounterName": "Total Bytes Received"
+            },
+            {
+                "CimPropertyName": "BytesTotal",
+                "CounterName": "Total Bytes"
+            },
+            {
+                "CimPropertyName": "PacketsTransmitted",
+                "CounterName": "Total Packets Transmitted"
+            },
+            {
+                "CimPropertyName": "PacketsReceived",
+                "CounterName": "Total Packets Received"
+            },
+            {
+                "CimPropertyName": "TotalRxErrors",
+                "CounterName": "Total Rx Errors"
+            },
+            {
+                "CimPropertyName": "TotalTxErrors",
+                "CounterName": "Total Tx Errors"
+            },
+            {
+                "CimPropertyName": "TotalCollisions",
+                "CounterName": "Total Collisions"
+            }
+        ]
+    },
     {
         "CimClassName": "SCX_FileSystemStatisticalInformation",
         "ObjectName": "Logical Disk",

test/code/plugins/omi_lib_test.rb

@@ -114,6 +114,14 @@ def test_transform_class_returns_valid_record_all_counters
 			"System Size Stored In Paging Files",
 			"System Free Space in Paging Files",
 			"System Uptime",
+			"Network Total Bytes Transmitted",
+			"Network Total Bytes Received",
+			"Network Total Bytes",
+			"Network Total Packets Transmitted",
+			"Network Total Packets Received",
+			"Network Total Rx Errors",
+			"Network Total Tx Errors",
+			"Network Total Collisions",
 			"Process Pct Privileged Time",
 			"Process Pct User Time",
 			"Process Used Memory kBytes",
@@ -189,6 +197,11 @@ def test_transform_class_returns_valid_record_all_counters
 		expected_process_record = [{"Host":"testhost", "ObjectName":"Process","InstanceName":"omsagent","Collections":[{"CounterName":"Pct User Time","Value":"0"},{"CounterName":"Pct Privileged Time","Value":"0"},{"CounterName":"Virtual Shared Memory","Value":"5216"}]}]
 		transform_validate_records_helper(expected_process_record, process_perf_record , all_performance_counters, "Process Input Class Failed!")
 
+		#Test SCX_EthernetPortStatistics
+		network_perf_record = [{"ClassName"=>"SCX_EthernetPortStatistics", "Caption"=>"Ethernet port information", "Description"=>"Statistics on transfer performance for a port", "InstanceID"=>"eth0", "BytesTransmitted"=>"3401031988", "BytesReceived"=>"2524808807", "PacketsTransmitted"=>"14880048", "PacketsReceived"=>"41066922", "BytesTotal"=>"5925840795", "TotalRxErrors"=>"0", "TotalTxErrors"=>"0", "TotalCollisions"=>"0"}]
+		expected_network_record = [{"Host":"testhost","ObjectName":"Network","InstanceName":"eth0","Collections":[{"CounterName":"Total Bytes Transmitted","Value":"3401031988"},{"CounterName":"Total Bytes Received","Value":"2524808807"},{"CounterName":"Total Bytes","Value":"5925840795"},{"CounterName":"Total Packets Transmitted","Value":"14880048"},{"CounterName":"Total Packets Received","Value":"41066922"},{"CounterName":"Total Rx Errors","Value":"0"},{"CounterName":"Total Tx Errors","Value":"0"},{"CounterName":"Total Collisions","Value":"0"}]}]
+		transform_validate_records_helper(expected_network_record, network_perf_record , all_performance_counters, "Network Input Class Failed!")
+
 		#Test Apache_HTTPDServerStatistics
 		apacheserver_perf_record = [{"ClassName"=>"Apache_HTTPDServerStatistics","InstanceID"=>"/etc/httpd/conf/httpd.conf","TotalPctCPU"=>"0","IdleWorkers"=>"0","BusyWorkers"=>"0","PctBusyWorkers"=>"0","ConfigurationFile"=>"/etc/httpd/conf/httpd.conf"}]
 		expected_apacheserver_record = [{"Host":"testhost", "ObjectName":"Apache HTTP Server","InstanceName":"/etc/httpd/conf/httpd.conf","Collections":[{"CounterName":"Total Pct CPU","Value":"0"},{"CounterName":"Idle Workers","Value":"0"},{"CounterName":"Busy Workers","Value":"0"},{"CounterName":"Pct Busy Workers","Value":"0"}]}]
@@ -219,6 +232,7 @@ def test_transform_class_returns_valid_record_filter_counters
 			"Container Processor Usage sec",
 			"System Uptime",
 			"Process Pct User Time",
+			"Network Total Packets Received",
 			"Apache HTTP Server Total Pct CPU",
 			"Apache Virtual Host Requests per Second",
 			"MySQL Database Tables",
@@ -261,6 +275,12 @@ def test_transform_class_returns_valid_record_filter_counters
 		expected_process_record = [{"Host":"testhost", "ObjectName":"Process","InstanceName":"omsagent","Collections":[{"CounterName":"Pct User Time","Value":"0"}]}]
 		transform_validate_records_helper(expected_process_record, process_perf_record , filtered_performance_counters, "Filtered Process Input Class Failed!")
 
+		#Test SCX_EthernetPortStatistics
+		network_perf_record = [{"ClassName"=>"SCX_EthernetPortStatistics", "Caption"=>"Ethernet port information", "Description"=>"Statistics on transfer performance for a port", "InstanceID"=>"eth0", "BytesTransmitted"=>"3401031988", "BytesReceived"=>"2524808807", "PacketsTransmitted"=>"14880048", "PacketsReceived"=>"41066922", "BytesTotal"=>"5925840795", "TotalRxErrors"=>"0", "TotalTxErrors"=>"0", "TotalCollisions"=>"0"}] 
+
+		expected_network_record = [{"Host":"testhost", "ObjectName":"Network","InstanceName":"eth0","Collections":[{"CounterName":"Total Packets Received","Value":"41066922"}]}]
+		transform_validate_records_helper(expected_network_record, network_perf_record , filtered_performance_counters, "Filtered Process Input Class Failed!")                                 
+
 		#Test Apache_HTTPDServerStatistics
 		apacheserver_perf_record = [{"ClassName"=>"Apache_HTTPDServerStatistics","InstanceID"=>"/etc/httpd/conf/httpd.conf","TotalPctCPU"=>"0","IdleWorkers"=>"0","BusyWorkers"=>"0","PctBusyWorkers"=>"0","ConfigurationFile"=>"/etc/httpd/conf/httpd.conf"}]
 		expected_apacheserver_record = [{"Host":"testhost", "ObjectName":"Apache HTTP Server","InstanceName":"/etc/httpd/conf/httpd.conf","Collections":[{"CounterName":"Total Pct CPU","Value":"0"}]}]
@@ -318,6 +338,11 @@ def test_transform_class_returns_valid_record_filter_out_all_counters
 		expected_process_record = [{"Host":"testhost", "ObjectName":"Process","InstanceName":"omsagent","Collections":[]}]
 		transform_validate_records_helper(expected_process_record, process_perf_record , [], "Process Input with no counters Failed!")
 
+		#Test SCX_EthernetPortStatistics
+		network_perf_record = [{"ClassName"=>"SCX_EthernetPortStatistics", "Caption"=>"Ethernet port information", "Description"=>"Statistics on transfer performance for a port", "InstanceID"=>"eth0", "BytesTransmitted"=>"3401031988", "BytesReceived"=>"2524808807", "PacketsTransmitted"=>"14880048", "PacketsReceived"=>"41066922", "BytesTotal"=>"5925840795", "TotalRxErrors"=>"0", "TotalTxErrors"=>"0", "TotalCollisions"=>"0"}]
+		expected_network_record = [{"Host":"testhost","ObjectName":"Network","InstanceName":"eth0","Collections":[]}]
+		transform_validate_records_helper(expected_network_record, network_perf_record , [], "Network Input with no counters Failed!")
+
 		#Test Apache_HTTPDServerStatistics
 		apacheserver_perf_record = [{"ClassName"=>"Apache_HTTPDServerStatistics","InstanceID"=>"/etc/httpd/conf/httpd.conf","TotalPctCPU"=>"0","IdleWorkers"=>"0","BusyWorkers"=>"0","PctBusyWorkers"=>"0","ConfigurationFile"=>"/etc/httpd/conf/httpd.conf"}]
 		expected_apacheserver_record = [{"Host":"testhost", "ObjectName":"Apache HTTP Server","InstanceName":"/etc/httpd/conf/httpd.conf","Collections":[]}]