CPU shows up on snapshot!

surgicalcoder · surgicalcoder · commit bf759b1377e5 · 2018-02-09T11:52:53.000Z
diff --git a/Tether/Metrics/CPUUtilisationMetricProvider.cs b/Tether/Metrics/CPUUtilisationMetricProvider.cs
@@ -1,31 +1,80 @@
 ﻿using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using Tether.Plugins;
 
 namespace Tether.Metrics
 {
     public class CPUUtilisationMetricProvider : IMetricProvider
     {
-        PerformanceCounter counter;
-        // serverdensity.cpu.util.pct
+        //List<PerformanceCounter> counters;
+        Dictionary<string, List<PerformanceCounter>> counters;
+        PerformanceCounterCategory performanceCounterCategory;
+        string[] instanceNames;
+
+        List<string> counterNames = new List<string>
+        {
+            "% Interrupt Time",
+            "% Privileged Time",
+            "% Processor Time",
+            "% User Time",
+            "% Idle Time"
+        };
+
         public CPUUtilisationMetricProvider()
         {
             
         }
 
         public List<Metric> GetMetrics()
         {
-            if (counter == null)
+            if (counters == null)
             {
-                counter = new PerformanceCounter("Processor", "% Processor Time", "_Total");
+                counters = new Dictionary<string, List<PerformanceCounter>>();        
+                
+                performanceCounterCategory = new PerformanceCounterCategory("Processor");
+                instanceNames = performanceCounterCategory.GetInstanceNames();
+
+                foreach (var instanceName in instanceNames)
+                {
+                    var performanceCounters = performanceCounterCategory.GetCounters(instanceName);
+
+                    var list = performanceCounters.Where(f=> counterNames.Contains(f.CounterName) ).ToList();
+
+                    counters.Add(instanceName, list);
+                }
             }
-           
-            return new List<Metric>
-            {
-                new Metric("serverdensity.cpu.util.pct", counter.NextValue()),
-                new Metric("system.load.1", counter.NextValue()),
 
+            var totalProcessorTimeCounter = counters["_Total"].FirstOrDefault(r=>r.CounterName == "% Processor Time");
+            var totalProcessorTimeValue = totalProcessorTimeCounter.NextValue();
+
+            var values =  new List<Metric>
+            {
+                new Metric("serverdensity.cpu.util.pct", totalProcessorTimeValue),
+                new Metric("system.load.1", totalProcessorTimeValue),
             };
+
+            foreach (var instance in counters)
+            {
+                values.Add(new Metric("serverdensity.cpu.gnice", 0, tags:new Dictionary<string, string>{{"device_name", instance.Key}}));
+                values.Add(new Metric("serverdensity.cpu.guest", 0, tags:new Dictionary<string, string>{{"device_name", instance.Key}}));
+
+                values.Add(new Metric("serverdensity.cpu.sys", instance.Value.FirstOrDefault(f=>f.CounterName == "% Privileged Time").NextValue(), tags:new Dictionary<string, string>{{"device_name", instance.Key}}));
+                values.Add(new Metric("serverdensity.cpu.usr", instance.Value.FirstOrDefault(f=>f.CounterName == "% User Time").NextValue(), tags:new Dictionary<string, string>{{"device_name", instance.Key}}));
+                values.Add(new Metric("serverdensity.cpu.idle", instance.Value.FirstOrDefault(f=>f.CounterName == "% Idle Time").NextValue(), tags:new Dictionary<string, string>{{"device_name", instance.Key}}));
+                
+
+                
+            }
+
+            /*
+             *             'serverdensity.cpu.gnice': 'cpuStats',
+        'serverdensity.cpu.guest': 'cpuStats',
+        'serverdensity.cpu.sys': 'cpuStats',
+        'serverdensity.cpu.usr': 'cpuStats',
+        'serverdensity.cpu.idle': 'cpuStats',
+             */
+            return values;
         }
     }
 }
