Revert "Revert "Merge pull request intel#791 from intel/rdementi-disa…

…ble-freq-metrics-for-prometheus""

This reverts commit d40db61.

src/pcm-sensor-server.cpp

@@ -761,8 +761,10 @@ class PrometheusPrinter : Visitor
         printCounter( "L3 Cache Occupancy",       getL3CacheOccupancy   ( after ) );
         printCounter( "Invariant TSC",            getInvariantTSC       ( before, after ) );
         printCounter( "SMI Count",                getSMICount           ( before, after ) );
-
+#if 0
+        // disabling this metric for a moment due to https://github.com/intel/pcm/issues/789
         printCounter( "Core Frequency",           getActiveAverageFrequency ( before, after ) );
+#endif
         //DBG( 2, "Invariant TSC before=", before.InvariantTSC, ", after=", after.InvariantTSC, ", difference=", after.InvariantTSC-before.InvariantTSC );
 
         printCounter( "Thermal Headroom", after.getThermalHeadroom() );
@@ -805,11 +807,14 @@ class PrometheusPrinter : Visitor
         printCounter( "PP0 Joules Consumed",           getConsumedJoules      ( 0, before, after ) );
         printCounter( "PP1 Joules Consumed",           getConsumedJoules      ( 1, before, after ) );
         printCounter( "DRAM Joules Consumed",          getDRAMConsumedJoules  ( before, after ) );
+#if 0
+        // disabling these metrics for a moment due to https://github.com/intel/pcm/issues/789
         auto uncoreFrequencies = getUncoreFrequencies( before, after );
         for (size_t i = 0; i < uncoreFrequencies.size(); ++i)
         {
             printCounter( std::string("Uncore Frequency Die ") + std::to_string(i), uncoreFrequencies[i]);
         }
+#endif
         uint32 i = 0;
         for ( ; i <= ( PCM::MAX_C_STATE ); ++i ) {
             std::stringstream s;