Move disk and memory metrics in custom group to compute

Author: chrishenzie

pkg/exporters/stackdriver/stackdriver_exporter.go

@@ -54,7 +54,7 @@ var NPDMetricToSDMetric = map[metrics.MetricID]string{
 	metrics.CPULoad15m:              "compute.googleapis.com/guest/cpu/load_15m",
 	metrics.DiskAvgQueueLenID:       "compute.googleapis.com/guest/disk/queue_length",
 	metrics.DiskBytesUsedID:         "compute.googleapis.com/guest/disk/bytes_used",
-	metrics.DiskPercentUsedID:       "custom.googleapis.com/guest/disk/percent_used",
+	metrics.DiskPercentUsedID:       "compute.googleapis.com/guest/disk/percent_used",
 	metrics.DiskIOTimeID:            "compute.googleapis.com/guest/disk/io_time",
 	metrics.DiskMergedOpsCountID:    "compute.googleapis.com/guest/disk/merged_operation_count",
 	metrics.DiskOpsBytesID:          "compute.googleapis.com/guest/disk/operation_bytes_count",
@@ -67,7 +67,7 @@ var NPDMetricToSDMetric = map[metrics.MetricID]string{
 	metrics.MemoryDirtyUsedID:       "compute.googleapis.com/guest/memory/dirty_used",
 	metrics.MemoryPageCacheUsedID:   "compute.googleapis.com/guest/memory/page_cache_used",
 	metrics.MemoryUnevictableUsedID: "compute.googleapis.com/guest/memory/unevictable_used",
-	metrics.MemoryPercentUsedID:     "custom.googleapis.com/guest/memory/percent_used",
+	metrics.MemoryPercentUsedID:     "compute.googleapis.com/guest/memory/percent_used",
 	metrics.ProblemCounterID:        "compute.googleapis.com/guest/system/problem_count",
 	metrics.ProblemGaugeID:          "compute.googleapis.com/guest/system/problem_state",
 	metrics.OSFeatureID:             "compute.googleapis.com/guest/system/os_feature_enabled",