From d3e15794302d57f0d35a836cf8b43397e40f239f Mon Sep 17 00:00:00 2001 From: "yosep.simanjuntak" Date: Tue, 3 Mar 2026 18:11:30 +0700 Subject: [PATCH 1/5] feat: add condition if we want to override kibana url --- app/views/app_groups/_list.html.slim | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/app_groups/_list.html.slim b/app/views/app_groups/_list.html.slim index 259dd130..671fee24 100644 --- a/app/views/app_groups/_list.html.slim +++ b/app/views/app_groups/_list.html.slim @@ -9,7 +9,7 @@ table.table.table-hover.table-sm thead tr.d-flex - th.col-2 =filterrific_sorting_link(@filterrific, :name) + th.col-2 = filterrific_sorting_link(@filterrific, :name) th.col-1 Cluster Name th.col-2 Location th.col-2 Capacity @@ -69,9 +69,12 @@ table.table.table-hover.table-sm br td.col-2 class="d-flex" - if policy(app_group).see_app_groups? + - location_name = app_group.kibana_helm_infrastructure&.infrastructure_location&.name + - override_map = ENV['BARITO_VIEWER_LOCATION_OVERRIDED_MAP'].to_s.split(',').map { |pair| pair.split('=') }.to_h + - viewer_domain = override_map[location_name] || Figaro.env.viewer_domain .btn.btn-primary.btn-sm style="height: fit-content;" i.fas.fa-search.mr-1 - = link_to 'Open Kibana', "#{Figaro.env.viewer_protocol}://#{Figaro.env.viewer_domain}/#{app_group.cluster_name}/", class: 'text-light', target: '_blank', rel: 'noopener noreferrer', style: 'text-decoration: none' + = link_to 'Open Kibana', "#{Figaro.env.viewer_protocol}://#{viewer_domain}/#{app_group.cluster_name}/", class: 'text-light', target: '_blank', rel: 'noopener noreferrer', style: 'text-decoration: none' = form_for(app_group, url: bookmark_app_group_path(app_group.id), method: :post, html: { class: 'ml-1' }) do |f| = hidden_field_tag(:app_group_id, app_group.id) = f.button class: 'btn btn-sm bg-transparent text-warning' From 16ebda693e7705e181b71ae6b7f11a239c66465b Mon Sep 17 00:00:00 2001 From: "yosep.simanjuntak" Date: Tue, 3 Mar 2026 18:12:53 +0700 Subject: [PATCH 2/5] update table coloumn --- app/views/app_groups/_list.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/app_groups/_list.html.slim b/app/views/app_groups/_list.html.slim index 671fee24..cb76d798 100644 --- a/app/views/app_groups/_list.html.slim +++ b/app/views/app_groups/_list.html.slim @@ -9,7 +9,7 @@ table.table.table-hover.table-sm thead tr.d-flex - th.col-2 = filterrific_sorting_link(@filterrific, :name) + th.col-2 =filterrific_sorting_link(@filterrific, :name) th.col-1 Cluster Name th.col-2 Location th.col-2 Capacity From 02f9c5bae530b0fc2e1c8e40d5ea8b1b7cb0277c Mon Sep 17 00:00:00 2001 From: "yosep.simanjuntak" Date: Tue, 3 Mar 2026 18:16:16 +0700 Subject: [PATCH 3/5] change the env name --- app/views/app_groups/_list.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/app_groups/_list.html.slim b/app/views/app_groups/_list.html.slim index cb76d798..0f050e51 100644 --- a/app/views/app_groups/_list.html.slim +++ b/app/views/app_groups/_list.html.slim @@ -70,7 +70,7 @@ table.table.table-hover.table-sm td.col-2 class="d-flex" - if policy(app_group).see_app_groups? - location_name = app_group.kibana_helm_infrastructure&.infrastructure_location&.name - - override_map = ENV['BARITO_VIEWER_LOCATION_OVERRIDED_MAP'].to_s.split(',').map { |pair| pair.split('=') }.to_h + - override_map = ENV['BARITO_VIEWER_DOMAIN_OVERRIDED_MAP'].to_s.split(',').map { |pair| pair.split('=') }.to_h - viewer_domain = override_map[location_name] || Figaro.env.viewer_domain .btn.btn-primary.btn-sm style="height: fit-content;" i.fas.fa-search.mr-1 From 28710f64d25905a909c078ab78a307f9ba9ba85c Mon Sep 17 00:00:00 2001 From: "yosep.simanjuntak" Date: Wed, 4 Mar 2026 14:07:40 +0700 Subject: [PATCH 4/5] feat: add condition to overide kibana url for show page --- app/views/app_groups/show.html.slim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/app_groups/show.html.slim b/app/views/app_groups/show.html.slim index 985fabb5..9ea148d9 100644 --- a/app/views/app_groups/show.html.slim +++ b/app/views/app_groups/show.html.slim @@ -120,9 +120,13 @@ = @labels['app-group'][label] .card-footer + - location_name = @app_group.kibana_helm_infrastructure&.infrastructure_location&.name + - override_map = ENV['BARITO_VIEWER_DOMAIN_OVERRIDED_MAP'].to_s.split(',').map { |pair| pair.split('=') }.to_h + - viewer_domain = override_map[location_name] || Figaro.env.viewer_domain + .btn.btn-primary.btn-sm.mr-2 i.fas.fa-search.mr-1 - = link_to 'Open Kibana', @open_kibana_url, target: '_blank', rel: 'noopener noreferrer', class: 'text-light', style: 'text-decoration: none' + = link_to 'Open Kibana', "#{Figaro.env.viewer_protocol}://#{viewer_domain}/#{@app_group.cluster_name}/", class: 'text-light', target: '_blank', rel: 'noopener noreferrer', style: 'text-decoration: none' .btn.btn-primary.btn-sm.mr-2 i.fas.fa-tachometer-alt.mr-1 = link_to 'Monitoring', @open_katulampa_url, target: '_blank', rel: 'noopener noreferrer', class: 'text-light', style: 'text-decoration: none' From ed70a6ea7be3bc5ea7e65141bca574a5aee69b29 Mon Sep 17 00:00:00 2001 From: "yosep.simanjuntak" Date: Wed, 4 Mar 2026 14:15:06 +0700 Subject: [PATCH 5/5] update style open kibana button --- app/views/app_groups/show.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/app_groups/show.html.slim b/app/views/app_groups/show.html.slim index 9ea148d9..d478d63f 100644 --- a/app/views/app_groups/show.html.slim +++ b/app/views/app_groups/show.html.slim @@ -126,7 +126,7 @@ .btn.btn-primary.btn-sm.mr-2 i.fas.fa-search.mr-1 - = link_to 'Open Kibana', "#{Figaro.env.viewer_protocol}://#{viewer_domain}/#{@app_group.cluster_name}/", class: 'text-light', target: '_blank', rel: 'noopener noreferrer', style: 'text-decoration: none' + = link_to 'Open Kibana', "#{Figaro.env.viewer_protocol}://#{viewer_domain}/#{@app_group.cluster_name}/", target: '_blank', rel: 'noopener noreferrer', class: 'text-light', style: 'text-decoration: none' .btn.btn-primary.btn-sm.mr-2 i.fas.fa-tachometer-alt.mr-1 = link_to 'Monitoring', @open_katulampa_url, target: '_blank', rel: 'noopener noreferrer', class: 'text-light', style: 'text-decoration: none'