From 79eea0c1b3d0867d0ff6268cb309840fbf716f8e Mon Sep 17 00:00:00 2001 From: ByeonJungHun <131643404+ByeonJungHun@users.noreply.github.com> Date: Thu, 18 May 2023 14:46:18 +0900 Subject: [PATCH] release 3.5.1 --- .../postgres/postgres_insert_dml.psql | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/roles/cmoa_install/files/03-ddl-dml/postgres/postgres_insert_dml.psql b/roles/cmoa_install/files/03-ddl-dml/postgres/postgres_insert_dml.psql index 76a47f5..d8cae7a 100755 --- a/roles/cmoa_install/files/03-ddl-dml/postgres/postgres_insert_dml.psql +++ b/roles/cmoa_install/files/03-ddl-dml/postgres/postgres_insert_dml.psql @@ -99,6 +99,9 @@ INSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Wo INSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Workloads|Jobs', false, null); -- NSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Workloads|Cron Jobs', false, null); INSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Workloads|Deploy List', false, null); +INSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Workloads|Deploy List|List', false, null); +INSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Workloads|Deploy List|Scale', false, null); +INSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Workloads|Deploy List|Yaml', false, null); INSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Services|Topology', false, null); INSERT INTO public.auth_resource3 (name, is_deleted, tenant_id) VALUES ('menu|Services|Structure', false, null); @@ -191,6 +194,9 @@ INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resou INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (10, 'Workloads', '02.Workload', 1, NULL, (select id from auth_resource3 where name='menu|Workloads'), 3); INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (11, 'Overview', NULL, 0, 'overviewWorkloads', (select id from auth_resource3 where name='menu|Workloads|Overview'), 3); INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (12, 'deployList', NULL, 1, 'deployListWorkloads', (select id from auth_resource3 where name='menu|Workloads|Deploy List'), 2); +INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (13, 'deployList(List)', NULL, 2, '', (select id from auth_resource3 where name='menu|Workloads|Deploy List|List'), 0); +INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (14, 'deployList(Scale)', NULL, 3, '', (select id from auth_resource3 where name='menu|Workloads|Deploy List|Scale'), 0); +INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (15, 'deployList(Yaml)', NULL, 4, '', (select id from auth_resource3 where name='menu|Workloads|Deploy List|Yaml'), 0); INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (17, 'Jobs', NULL, 6, 'jobsWorkloads', (select id from auth_resource3 where name='menu|Workloads|Jobs'), 2); -- INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (18, 'Cron Jobs', NULL, 7, 'cronJobsWorkloads', (select id from auth_resource3 where name='menu|Workloads|Cron Jobs'), 2); INSERT INTO public.menu_meta (id, description, icon, "position", url, auth_resource3_id, scope_level) VALUES (19, 'Pods', NULL, 8, 'podsWorkloads', (select id from auth_resource3 where name='menu|Workloads|Pods'), 3); @@ -1000,6 +1006,14 @@ INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,ent INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,anomaly_score,message,created_date,modified_date) VALUES ('redis_key_hit_raito','Redis key hit raito','redis key hit raito','sum by (data_type, xm_clst_id, xm_namespace, xm_node_id, instance) ( label_replace(rate(redis_keyspace_hits_total [1m]), "data_type", "hits", "" , "") or label_replace(rate(redis_keyspace_misses_total [1m]), "data_type", "misses", "" , "") )','Keyspace','Redis','data_type',true,false,'redis key hit raito','2020-01-29 02:28:03.000','2020-02-13 00:46:27.568'); + +-- CLOUD-16405 Metric Meta | 대시보드 관련 메트릭 수정 +-- REDIS Slave 관련 메트릭 추가 +INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,anomaly_score,message,created_date,modified_date) VALUES + ('redis_connected_slave_lag_seconds','Redis Connected Slave Lag Seconds','Redis Connected Slave Lag Seconds','sum by (xm_clst_id, xm_namespace, xm_node_id, instance, slave_ip, slave_port) (rate(redis_connected_slave_lag_seconds[1m]))','Worker','Redis',NULL,true,true,'Redis Connected Slave Lag Seconds','2023-03-16 14:39:57.420','2023-03-16 14:39:57.420'), + ('redis_connected_slave_offset_bytes','Redis Connected Slave Offset Bytes','Redis Connected Slave Offset Bytes','sum by (xm_clst_id, xm_namespace, xm_node_id, instance, slave_ip, slave_port) (rate(redis_connected_slave_offset_bytes[1m]))','Worker','Redis',NULL,true,true,'Redis Connected Slave Offset Bytes','2023-03-16 14:37:43.734','2023-03-16 14:38:22.164'), + ('redis_connected_slaves','Redis Connected Slaves','Redis Connected Slaves','sum by (xm_clst_id, xm_namespace, xm_node_id, instance) (redis_connected_slaves)','Worker','Redis',NULL,true,true,'Redis Connected Slaves','2023-03-16 13:57:09.423','2023-03-16 13:59:50.746'); + INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,anomaly_score,message,created_date,modified_date) VALUES ('pg_net_byte_total','Network byte','Network byte','sum by (data_type, xm_clst_id, xm_namespace, xm_node_id, instance) ( label_replace(rate(redis_net_input_bytes_total [1m]), "data_type", "input", "", "") or label_replace(rate(redis_net_output_bytes_total [1m]), "data_type", "output", "", ""))','Network','PostgreSQL','data_type',true,false,'Network byte','2020-01-30 07:22:12.000','2020-02-13 01:04:18.528'); @@ -2434,7 +2448,7 @@ INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,ent INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,message) VALUES ('traefik_http_requests_4xx_total_last_1h','Traefik HTTP Requests 4xx Total Last 1h','Number of 4xx error requests in 1 hour','sum(increase(traefik_service_requests_total{code=~"4[0-9]{2}"}[1h]))','Request','Traefik','xm_clst_id, xm_namespace, xm_pod_id',true,'None'); INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,message) - VALUES ('traefik_http_requests_5xx_total_last_1h','Traefik HTTP Requests 4xx Total Last 1h','Number of 5xx error requests in 1 hour','sum(increase(traefik_service_requests_total{code=~"5[0-9]{2}"}[1h]))','Request','Traefik','xm_clst_id, xm_namespace, xm_pod_id',true,'None'); + VALUES ('traefik_http_requests_5xx_total_last_1h','Traefik HTTP Requests 5xx Total Last 1h','Number of 5xx error requests in 1 hour','sum(increase(traefik_service_requests_total{code=~"5[0-9]{2}"}[1h]))','Request','Traefik','xm_clst_id, xm_namespace, xm_pod_id',true,'None'); INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,in_use,message) VALUES ('traefik_http_response_time_ms','Traefik HTTP Response Time Milisecond','Traefik HTTP Response Time (ms)','sum(increase(traefik_service_request_duration_seconds_sum[5m])) / sum(increase(traefik_entrypoint_requests_total[5m])) * 1000','Response','Traefik',true,'None'); INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,in_use,message) @@ -2445,6 +2459,11 @@ INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,ent VALUES ('traefik_http_requests_total_last_10m','Traefik HTTP Requests Total Last 10m','Number requests in 10 minutes','sum(increase(traefik_service_requests_total{}[10m]))','Request','Traefik','xm_clst_id, xm_namespace, xm_pod_id',true,'CLST:{{$labels.xm_clst_id}} NS:{{$labels.xm_namespace}} POD:{{$labels.xm_pod_id}} Trafik Request Count (10m) :{{humanize $value}}|{threshold}.'); INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,message) VALUES ('traefik_http_requests_total_last_1h','Traefik HTTP Requests Total Last 1h','Number requests in 1 hour','sum(increase(traefik_service_requests_total{}[1h]))','Request','Traefik','xm_clst_id, xm_namespace, xm_pod_id',true,'CLST:{{$labels.xm_clst_id}} NS:{{$labels.xm_namespace}} POD:{{$labels.xm_pod_id}} Trafik Request Count (1h) :{{humanize $value}}|{threshold}.'); +INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,anomaly_score,message,created_date,modified_date) VALUES + ('traefik_http_requests_bad_total_last_10m','Traefik HTTP Requests Bad Total Last 10m','Number bad requests in 10 minutes','sum(increase(traefik_service_requests_total{code=~"4[0-9]{2}|5[0-9]{2}"}[10m]))','Request','Traefik','service',true,false,'CLST:{{$labels.xm_clst_id}} NS:{{$labels.xm_namespace}} POD:{{$labels.xm_pod_id}} Trafik Bad Request Count (10m) :{{humanize $value}}|{threshold}.','2023-03-17 14:10:13.163','2023-03-17 14:10:13.163'), + ('traefik_http_requests_bad_total_last_1h','Traefik HTTP Requests Bad Total Last 1h','Number bad requests in 1 hour','sum(increase(traefik_service_requests_total{code=~"4[0-9]{2}|5[0-9]{2}"}[1h]))','Request','Traefik','service',true,false,'CLST:{{$labels.xm_clst_id}} NS:{{$labels.xm_namespace}} POD:{{$labels.xm_pod_id}} Trafik Bad Request Count (1h) :{{humanize $value}}|{threshold}.','2023-03-17 14:10:13.163','2023-03-17 14:10:13.163'); +INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,anomaly_score,message,created_date,modified_date) VALUES + ('traefik_status_code_count','Traefik Status Code Count ','Traefik Status Code Count ','sum(increase(traefik_service_requests_total{protocol=~"http|https"}[10m])) by (code)','Request','Traefik','code',true,false,'None','2023-03-17 14:33:13.020','2023-03-17 14:33:13.020'); -- MySQL-MariaDB 대시보드 지원 관련 metric meta 추가 -- Auto-generated SQL script #202303201205 @@ -2469,4 +2488,3 @@ INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,ent INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,anomaly_score,message) VALUES('nginx_ingress_controller_nginx_reloads_total','Nginx Ingress reload success total','Number of successful NGINX reloads','sum by (xm_clst_id, xm_namespace, xm_node_id, instance, class) (nginx_ingress_controller_nginx_reloads_total)','Config','Nginx-Ingress','',true,false,'None'); INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,anomaly_score,message) VALUES('nginx_ingress_nginx_http_requests_total','Nginx Ingress Http Request Total','Total http requests','sum by (xm_clst_id, xm_namespace, xm_node_id, instance, class) (nginx_ingress_nginx_http_requests_total)','Request','Nginx-Ingress','',true,false,'None'); INSERT INTO public.metric_meta2 (id,meta_name,description,expr,resource_type,entity_type,groupby_keys,in_use,anomaly_score,message) VALUES('nginx_ingress_nginx_http_requests_second','Nginx Ingress Http Request Seconds','Http request per second','sum by (xm_clst_id, xm_namespace, xm_node_id, instance, class) (rate(nginx_ingress_nginx_http_requests_total[1m]))','Request','Nginx-Ingress','',true,false,'None'); -