Merge branch 'add_waf_and_cilium_flags_into_fluentd_table' into 'master'

Add WAF and Cilium Log column for Fluentd table

See merge request gitlab-org/gitlab!29457

changelogs/unreleased/add_waf_and_cilium_flags_into_fluentd_table.yml

+---
+title: Add WAF and Cilium Log column for Fluentd table
+merge_request: 29457
+author:
+type: changed

db/migrate/20200413230056_add_waf_and_cilium_logs_to_applications_fluentd.rb

+# frozen_string_literal: true
+
+class AddWafAndCiliumLogsToApplicationsFluentd < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:clusters_applications_fluentd,
+                            :waf_log_enabled,
+                            :boolean,
+                            default: true,
+                            allow_null: false)
+    add_column_with_default(:clusters_applications_fluentd,
+                            :cilium_log_enabled,
+                            :boolean,
+                            default: true,
+                            allow_null: false)
+  end
+
+  def down
+    remove_column(:clusters_applications_fluentd,
+                  :waf_log_enabled)
+    remove_column(:clusters_applications_fluentd,
+                  :cilium_log_enabled)
+  end
+end

db/structure.sql

@@ -1663,7 +1663,9 @@ CREATE TABLE public.clusters_applications_fluentd (
     updated_at timestamp with time zone NOT NULL,
     version character varying(255) NOT NULL,
     host character varying(255) NOT NULL,
-    status_reason text
+    status_reason text,
+    waf_log_enabled boolean DEFAULT true NOT NULL,
+    cilium_log_enabled boolean DEFAULT true NOT NULL
 );
 
 CREATE SEQUENCE public.clusters_applications_fluentd_id_seq
@@ -13243,6 +13245,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200409211607
 20200410232012
 20200413072059
+20200413230056
 20200414144547
 20200415160722
 20200415161021