gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gitlab-rails-new-redis-helper' into 'master' 

Switch GitLab Exporter to use NewRedisHelper

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7333

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Nailia Iskhakova <niskhakova@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Nailia Iskhakova <niskhakova@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>
This commit is contained in:
Robert Marshall 2024-03-13 04:06:33 +00:00
parent 0810733551 d51f55fb0d
commit b2cbef04e9
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
files/gitlab-cookbooks/monitoring/recipes/gitlab-exporter.rb
View File

@ -16,7 +16,7 @@
# limitations under the License.
#
account_helper = AccountHelper.new(node)
redis_helper = RedisHelper.new(node)
redis_helper = NewRedisHelper::GitlabExporter.new(node)
logfiles_helper = LogfilesHelper.new(node)
logging_settings = logfiles_helper.logging_settings('gitlab-exporter')
gitlab_user = account_helper.gitlab_user
@ -51,8 +51,7 @@ connection_string += if node['postgresql']['enabled']
else
" host=#{node['gitlab']['gitlab_rails']['db_host']} port=#{node['gitlab']['gitlab_rails']['db_port']} password=#{node['gitlab']['gitlab_rails']['db_password']}"
end
redis_url = redis_helper.redis_url(support_sentinel_groupname: false)
redis_params = redis_helper.redis_params
template "#{gitlab_exporter_dir}/gitlab-exporter.yml" do
source "gitlab-exporter.yml.erb"
@ -64,9 +63,9 @@ template "#{gitlab_exporter_dir}/gitlab-exporter.yml" do
probe_elasticsearch: node['monitoring']['gitlab_exporter']['probe_elasticsearch'],
elasticsearch_url: node['monitoring']['gitlab_exporter']['elasticsearch_url'],
elasticsearch_authorization: node['monitoring']['gitlab_exporter']['elasticsearch_authorization'],
redis_url: redis_url,
redis_url: redis_params[:url],
connection_string: connection_string,
redis_enable_client: node['gitlab']['gitlab_rails']['redis_enable_client']
redis_enable_client: redis_params[:enable_client]
)
sensitive true
end

25
files/gitlab-cookbooks/package/libraries/helpers/new_redis_helper/gitlab_exporter.rb Normal file
View File

@ -0,0 +1,25 @@
module NewRedisHelper
class GitlabExporter < NewRedisHelper::Base
def redis_params
{
url: redis_url,
enable_client: enable_client
}
end
private
def enable_client
node_attr['redis_enable_client']
end
# GitLab Exporter uses the same Redis information as GitLab Rails
def node_access_keys
%w[gitlab gitlab_rails]
end
def support_sentinel_groupname?
false
end
end
end