From 8a11dcebe5bd48befeda3263ef9dd5f0bad1b7f8 Mon Sep 17 00:00:00 2001 From: david vhk <34706472+davidredborder@users.noreply.github.com> Date: Tue, 20 Jan 2026 13:36:48 +0000 Subject: [PATCH 1/2] bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add global filters configuration (#122) --------- Co-authored-by: Miguel Negrón <45871721+manegron@users.noreply.github.com> --- CHANGELOG.md | 5 +++++ resources/metadata.rb | 2 +- resources/providers/config.rb | 10 ++++++++++ resources/templates/default/global_filters.yml.erb | 6 ++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 resources/templates/default/global_filters.yml.erb diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cba988..544d3f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ cookbook-webui CHANGELOG =============== +## 1.11.2 + + - Miguel Negron + - [842fcae] Add global filters configuration (#122) + ## 1.11.1 - nilsver diff --git a/resources/metadata.rb b/resources/metadata.rb index 82a231b..9cd48d9 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -5,4 +5,4 @@ maintainer_email 'git@redborder.com' license 'AGPL-3.0' description 'Installs/Configures cookbook-webui' -version '1.11.1' +version '1.11.2' diff --git a/resources/providers/config.rb b/resources/providers/config.rb index a5db707..5f859ba 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -461,6 +461,16 @@ notifies :restart, 'service[webui]', :delayed unless node['redborder']['leader_configuring'] end + template '/var/www/rb-rails/config/global_filters.yml' do + source 'global_filters.yml.erb' + owner user + group group + mode '0644' + retries 2 + cookbook 'webui' + notifies :restart, 'service[webui]', :delayed unless node['redborder']['leader_configuring'] + end + %w(flow ips location monitor iot).each do |x| template "/var/www/rb-rails/lib/modules/#{x}/config/rbdruid_config.yml" do source "#{x}_rbdruid_config.yml.erb" diff --git a/resources/templates/default/global_filters.yml.erb b/resources/templates/default/global_filters.yml.erb new file mode 100644 index 0000000..10b3e98 --- /dev/null +++ b/resources/templates/default/global_filters.yml.erb @@ -0,0 +1,6 @@ +direction: + name: 'Direction' + icon: 'exchange' + select: + downstream: 'Downstream' + upstream: 'Upstream' From 813ad7c6d1d4a33798518e5c32a4bad346571ad3 Mon Sep 17 00:00:00 2001 From: Juan Soto Date: Tue, 3 Mar 2026 10:55:02 +0000 Subject: [PATCH 2/2] fix webui log rotation by replacing create with nocreate --- resources/templates/default/webui_log-rotate.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/templates/default/webui_log-rotate.erb b/resources/templates/default/webui_log-rotate.erb index e39d8bb..c2d9a51 100644 --- a/resources/templates/default/webui_log-rotate.erb +++ b/resources/templates/default/webui_log-rotate.erb @@ -7,7 +7,7 @@ rotate 5 missingok notifempty - create 0664 webui webui + nocreate copytruncate olddir /var/www/rb-rails/log/rotated }