release 3.5.0

roles/cmoa_install/files/03-ddl-dml/elasticsearch/es-ddl-put.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
-kubectl -n imxc wait --for=condition=ready pod/elasticsearch-1 --timeout=600s
-
 namespace=$1
+
+kubectl -n ${namespace} wait --for=condition=ready pod/elasticsearch-1 --timeout=600s
+
 export ES_NODEPORT=`kubectl -n ${namespace} get svc elasticsearch -o jsonpath='{.spec.ports[*].nodePort}'`
 
 export MASTER_IP=`kubectl get node -o wide | grep control-plane | awk '{print $6}'`

roles/cmoa_install/files/03-ddl-dml/postgres/postgres_insert_ddl.psql

@@ -47,7 +47,18 @@ ALTER TABLE ONLY public.alert_target
 ALTER TABLE ONLY public.alert_target
     ADD CONSTRAINT fkjrvj775641ky7s0f82kx3sile FOREIGN KEY (alert_group_id) REFERENCES public.alert_group(id);
 
+CREATE TABLE public.report_group (
+    id bigint NOT NULL,
+    created_by character varying(255),
+    created_date timestamp without time zone,
+    modified_by character varying(255),
+    modified_date timestamp without time zone,
+    users text,
+    name character varying(255)
+);
+ALTER TABLE public.report_group OWNER TO admin;
 
+ALTER TABLE ONLY public.report_group ADD CONSTRAINT report_group_pkey PRIMARY KEY (id);
 
 CREATE TABLE public.report_template (
     id bigint NOT NULL,
@@ -59,7 +70,8 @@ CREATE TABLE public.report_template (
     enable boolean NOT NULL,
     metric_data text,
     template_data text,
-    title character varying(255)
+    title character varying(255),
+    report_group_id int8 NULL
 );
 
 ALTER TABLE public.report_template OWNER TO admin;
@@ -67,6 +79,19 @@ ALTER TABLE public.report_template OWNER TO admin;
 ALTER TABLE ONLY public.report_template
     ADD CONSTRAINT report_template_pkey PRIMARY KEY (id);
 
+
+CREATE TABLE public.report_group_registry (
+    id bigint NOT NULL,
+    report_template_id bigint NOT NULL,
+    report_group_id bigint NOT NULL
+);
+
+ALTER TABLE public.report_group_registry OWNER TO admin;
+
+ALTER TABLE ONLY public.report_group_registry ADD CONSTRAINT report_group_registry_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY public.report_group_registry ADD CONSTRAINT report_group_registry_template_id_fk FOREIGN KEY (report_template_id) REFERENCES public.report_template(id);
+ALTER TABLE ONLY public.report_group_registry ADD CONSTRAINT report_group_registry_group_id_fk FOREIGN KEY (report_group_id) REFERENCES public.report_group(id);
+
 CREATE TABLE public.alert_event (
     id bigint NOT NULL,
     created_date timestamp without time zone NOT NULL,