diff --git a/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb b/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb index 46aae88b6eb3417cbecfb781f5954c8b3ada3e29_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIta2FzL3RlbXBsYXRlcy9kZWZhdWx0L2dpdGxhYi1rYXMtY29uZmlnLnltbC5lcmI=..38eb4c1289b7cfd2e83c5556d712b2fc74c307cd_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIta2FzL3RlbXBsYXRlcy9kZWZhdWx0L2dpdGxhYi1rYXMtY29uZmlnLnltbC5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb +++ b/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb @@ -10,7 +10,7 @@ gitlab: address: <%= @gitlab_address %> authentication_secret_file: <%= @authentication_secret_file %> -listen: +listen_agent: address: <%= @listen_address %> network: <%= @listen_network %> websocket: <%= @listen_websocket %> @@ -14,5 +14,5 @@ address: <%= @listen_address %> network: <%= @listen_network %> websocket: <%= @listen_websocket %> -metrics: +observability: usage_reporting_period: <%= @metrics_usage_reporting_period %>s diff --git a/spec/chef/recipes/gitlab-kas_spec.rb b/spec/chef/recipes/gitlab-kas_spec.rb index 46aae88b6eb3417cbecfb781f5954c8b3ada3e29_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLWthc19zcGVjLnJi..38eb4c1289b7cfd2e83c5556d712b2fc74c307cd_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLWthc19zcGVjLnJi 100644 --- a/spec/chef/recipes/gitlab-kas_spec.rb +++ b/spec/chef/recipes/gitlab-kas_spec.rb @@ -37,6 +37,7 @@ it 'correctly renders the KAS config file' do expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ address: localhost:8150}) expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ websocket: true}) + expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ usage_reporting_period: 60s}) end it 'correctly renders the KAS authentication secret file' do @@ -52,7 +53,8 @@ api_secret_key: 'QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE=', enable: true, listen_address: 'localhost:5006', - listen_websocket: false + listen_websocket: false, + metrics_usage_reporting_period: '120' } ) end @@ -68,6 +70,7 @@ it 'correctly renders the KAS config file' do expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ address: localhost:5006}) expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ websocket: false}) + expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ usage_reporting_period: 120s}) end it 'correctly renders the KAS authentication secret file' do