Move Canary and env metrics onto single chartutilize-multiple-queries

4 files changed, 29 insertions, 18 deletions

diff --git a/changelogs/unreleased/utilize-multiple-queries.yml b/changelogs/unreleased/utilize-multiple-queries.yml
new file mode 100644
index 00000000000..00ad6d2d5dc
--- /dev/null
+++ b/changelogs/unreleased/utilize-multiple-queries.yml
@@ -0,0 +1,5 @@
+---
+title: Display canary metrics alongside production metrics
+merge_request:
+author:
+type: changed
diff --git a/config/prometheus/common_metrics.yml b/config/prometheus/common_metrics.yml
index 9bdaf1575e9..b7f8d28e1c2 100644
--- a/config/prometheus/common_metrics.yml
+++ b/config/prometheus/common_metrics.yml
@@ -227,15 +227,9 @@
       query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024'
       label: Pod average
       unit: MB
-  - title: "Canary: Memory Usage (Pod Average)"
-    y_label: "Memory Used per Pod"
-    required_metrics:
-      - container_memory_usage_bytes
-    weight: 2
-    queries:
     - id: system_metrics_kubernetes_container_memory_average_canary
       query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024'
-      label: Pod average
+      label: Canary pod average
       unit: MB
       track: canary
   - title: "Core Usage (Pod Average)"
@@ -248,14 +242,8 @@
       query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name))'
       label: Pod average
       unit: "cores"
-  - title: "Canary: Core Usage (Pod Average)"
-    y_label: "Cores per Pod"
-    required_metrics:
-     - container_cpu_usage_seconds_total
-    weight: 1
-    queries:
     - id: system_metrics_kubernetes_container_core_usage_canary
       query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name))'
-      label: Pod average
+      label: Canary pod average
       unit: "cores"
       track: canary
diff --git a/db/migrate/20190311094943_consolidate_common_metrics.rb b/db/migrate/20190311094943_consolidate_common_metrics.rb
new file mode 100644
index 00000000000..9b53149ef99
--- /dev/null
+++ b/db/migrate/20190311094943_consolidate_common_metrics.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ConsolidateCommonMetrics < ActiveRecord::Migration[4.2]
+  include Gitlab::Database::MigrationHelpers
+
+  require Rails.root.join('db/importers/common_metrics_importer.rb')
+
+  DOWNTIME = false
+
+  def up
+    Importers::CommonMetricsImporter.new.execute
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 59a76e21a5f..03917b8d9b9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190301182457) do
+ActiveRecord::Schema.define(version: 20190311094943) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -37,13 +37,13 @@ ActiveRecord::Schema.define(version: 20190301182457) do
     t.integer "cached_markdown_version"
     t.text "new_project_guidelines"
     t.text "new_project_guidelines_html"
+    t.string "favicon"
     t.text "header_message"
     t.text "header_message_html"
     t.text "footer_message"
     t.text "footer_message_html"
     t.text "message_background_color"
     t.text "message_font_color"
-    t.string "favicon"
     t.boolean "email_header_and_footer_enabled", default: false, null: false
   end
 
@@ -175,8 +175,8 @@ ActiveRecord::Schema.define(version: 20190301182457) do
     t.string "commit_email_hostname"
     t.boolean "protected_ci_variables", default: false, null: false
     t.string "runners_registration_token_encrypted"
-    t.integer "local_markdown_version", default: 0, null: false
     t.integer "first_day_of_week", default: 0, null: false
+    t.integer "local_markdown_version", default: 0, null: false
     t.index ["usage_stats_set_by_user_id"], name: "index_application_settings_on_usage_stats_set_by_user_id", using: :btree
   end
 
@@ -1843,6 +1843,7 @@ ActiveRecord::Schema.define(version: 20190301182457) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["path"], name: "index_redirect_routes_on_path", unique: true, using: :btree
+    t.index ["path"], name: "index_redirect_routes_on_path_text_pattern_ops", using: :btree, opclasses: {"path"=>"varchar_pattern_ops"}
     t.index ["source_type", "source_id"], name: "index_redirect_routes_on_source_type_and_source_id", using: :btree
   end
 
@@ -2187,9 +2188,9 @@ ActiveRecord::Schema.define(version: 20190301182457) do
     t.integer "merge_request_notes_filter", limit: 2, default: 0, null: false
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
-    t.integer "first_day_of_week"
     t.string "issues_sort"
     t.string "merge_requests_sort"
+    t.integer "first_day_of_week"
     t.index ["user_id"], name: "index_user_preferences_on_user_id", unique: true, using: :btree
   end