From 1a641027d2d84e52989a8f3192080d723b14387c Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Mon, 5 Oct 2015 16:05:42 +0200 Subject: [PATCH] Changed data window size to 2m in Initial Resources It fixes the issue with delayed data after #14559 is merged --- plugin/pkg/admission/initialresources/admission.go | 2 +- plugin/pkg/admission/initialresources/influxdb.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin/pkg/admission/initialresources/admission.go b/plugin/pkg/admission/initialresources/admission.go index 98aeb8f3375..b3642a66163 100644 --- a/plugin/pkg/admission/initialresources/admission.go +++ b/plugin/pkg/admission/initialresources/admission.go @@ -39,7 +39,7 @@ var ( const ( initialResourcesAnnotation = "kubernetes.io/initial-resources" - samplesThreshold = 60 + samplesThreshold = 30 week = 7 * 24 * time.Hour month = 30 * 24 * time.Hour ) diff --git a/plugin/pkg/admission/initialresources/influxdb.go b/plugin/pkg/admission/initialresources/influxdb.go index 1664afbb7d9..0dbef97d8f6 100644 --- a/plugin/pkg/admission/initialresources/influxdb.go +++ b/plugin/pkg/admission/initialresources/influxdb.go @@ -27,10 +27,10 @@ import ( ) const ( - cpuSeriesName = "autoscaling.cpu.usage.1m" - memSeriesName = "autoscaling.memory.usage.1m" - cpuContinuousQuery = "select derivative(value) as value from \"cpu/usage_ns_cumulative\" where pod_id <> '' group by pod_id, pod_namespace, container_name, container_base_image, time(1m) into " + cpuSeriesName - memContinuousQuery = "select mean(value) as value from \"memory/usage_bytes_gauge\" where pod_id <> '' group by pod_id, pod_namespace, container_name, container_base_image, time(1m) into " + memSeriesName + cpuSeriesName = "autoscaling.cpu.usage.2m" + memSeriesName = "autoscaling.memory.usage.2m" + cpuContinuousQuery = "select derivative(value) as value from \"cpu/usage_ns_cumulative\" where pod_id <> '' group by pod_id, pod_namespace, container_name, container_base_image, time(2m) into " + cpuSeriesName + memContinuousQuery = "select mean(value) as value from \"memory/usage_bytes_gauge\" where pod_id <> '' group by pod_id, pod_namespace, container_name, container_base_image, time(2m) into " + memSeriesName timeFormat = "2006-01-02 15:04:05" ) @@ -140,7 +140,7 @@ func (s *influxdbSource) GetUsagePercentile(kind api.ResourceName, perc int64, i // TODO(pszczesniak): fix issue with dropped data base if len(res) == 0 { - return 0, 0, fmt.Errorf("Missing series %v in InfluxDB", series) + return 0, 0, fmt.Errorf("Missing data in series %v in InfluxDB", series) } points := res[0].GetPoints() if len(points) == 0 {