Skip to content

Allowing 'gitLab' to disable Prometheus. #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2022
Merged

Allowing 'gitLab' to disable Prometheus. #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5a6b93
Allowing 'gitLab' to disable Prometheus.
gregharvey Jan 17, 2022
aba5cff
Booleans to use in jinja2 as strings must be cast as strings.
gregharvey Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ce-dev/ansible/vars/provision/ce_provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ce_provision:
config_repository_branch: "1.x"
config_repository_skip_checkout: true
local_dir: "/home/ce-dev/ce-provision"
galaxy_custom_requirements_file: ""
galaxy_custom_requirements_file: "/home/ce-dev/ce-provision/ce-dev/ansible/vars/provision/galaxy-requirements.yml"
_ce_provision_base_dir: /home/ce-dev/ce-provision
_ce_provision_build_dir: /home/ce-dev/ce-provision/ce-dev/ansible/local
_ce_provision_build_tmp_dir: /tmp
Expand Down
8 changes: 8 additions & 0 deletions ce-dev/ansible/vars/provision/galaxy-requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
roles:
- name: geerlingguy.solr
- name: geerlingguy.java
- name: cloudalchemy.prometheus
- name: cloudalchemy.node_exporter
- name: cloudalchemy.alertmanager
- name: cloudalchemy.process_exporter
1 change: 0 additions & 1 deletion roles/ce_provision/meta/requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ collections:
- name: amazon.aws

roles:
- name: cloudalchemy.process_exporter
- name: geerlingguy.varnish
- name: geerlingguy.firewall
- name: geerlingguy.composer
Expand Down
5 changes: 4 additions & 1 deletion roles/gitlab/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ gitlab:
unicorn_worker_processes: 2
puma_worker_processes: 2
initial_root_password: ""
ldap: false
ldap: false # enable/disable LDAP integration
ldap_endpoint: "{{ ldap_client.endpoints[0] }}"
ldap_lookup_base: "{{ ldap_client.lookup_base }}"
ldap_binddn: "{{ ldap_client.binddn }}"
ldap_bindpw: "{{ ldap_client.bindpw }}"
prometheus: "true" # enable/disable built-in Prometheus
node_exporter: "true" # enable/disable built-in Prometheus Node Exporter
alertmanager: "true" # enable/disable built-in Prometheus Alertmanager
nginx:
listen_port: 8881
listen_https: nil
Expand Down
6 changes: 3 additions & 3 deletions roles/gitlab/templates/gitlab.rb.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ nginx['listen_https'] = {{ gitlab.nginx.listen_https }}
##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/
################################################################################

# prometheus['enable'] = true
prometheus['enable'] = {{ gitlab.prometheus }}
# prometheus['monitor_kubernetes'] = true
# prometheus['username'] = 'gitlab-prometheus'
# prometheus['group'] = 'gitlab-prometheus'
Expand Down Expand Up @@ -1427,7 +1427,7 @@ nginx['listen_https'] = {{ gitlab.nginx.listen_https }}
##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/alertmanager.html
################################################################################

# alertmanager['enable'] = true
alertmanager['enable'] = {{ gitlab.alertmanager }}
# alertmanager['home'] = '/var/opt/gitlab/alertmanager'
# alertmanager['log_directory'] = '/var/log/gitlab/alertmanager'
# alertmanager['admin_email'] = 'admin@example.com'
Expand All @@ -1449,7 +1449,7 @@ nginx['listen_https'] = {{ gitlab.nginx.listen_https }}
##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/node_exporter.html
################################################################################

# node_exporter['enable'] = true
node_exporter['enable'] = {{ gitlab.node_exporter }}
# node_exporter['home'] = '/var/opt/gitlab/node-exporter'
# node_exporter['log_directory'] = '/var/log/gitlab/node-exporter'
# node_exporter['flags'] = {
Expand Down