From e5a6b93d23b3ac70faa72fcdaab77dd3a5c3bf4f Mon Sep 17 00:00:00 2001 From: gregharvey Date: Mon, 17 Jan 2022 11:18:56 +0100 Subject: [PATCH 1/2] Allowing 'gitLab' to disable Prometheus. --- ce-dev/ansible/vars/provision/ce_provision.yml | 2 +- ce-dev/ansible/vars/provision/galaxy-requirements.yml | 8 ++++++++ roles/ce_provision/meta/requirements.yml | 1 - roles/gitlab/defaults/main.yml | 5 ++++- roles/gitlab/templates/gitlab.rb.j2 | 6 +++--- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 ce-dev/ansible/vars/provision/galaxy-requirements.yml diff --git a/ce-dev/ansible/vars/provision/ce_provision.yml b/ce-dev/ansible/vars/provision/ce_provision.yml index a93890652..6818f88bb 100644 --- a/ce-dev/ansible/vars/provision/ce_provision.yml +++ b/ce-dev/ansible/vars/provision/ce_provision.yml @@ -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 diff --git a/ce-dev/ansible/vars/provision/galaxy-requirements.yml b/ce-dev/ansible/vars/provision/galaxy-requirements.yml new file mode 100644 index 000000000..eeab8eed2 --- /dev/null +++ b/ce-dev/ansible/vars/provision/galaxy-requirements.yml @@ -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 diff --git a/roles/ce_provision/meta/requirements.yml b/roles/ce_provision/meta/requirements.yml index 0d87ad9c7..38b0d3b6a 100644 --- a/roles/ce_provision/meta/requirements.yml +++ b/roles/ce_provision/meta/requirements.yml @@ -5,7 +5,6 @@ collections: - name: amazon.aws roles: - - name: cloudalchemy.process_exporter - name: geerlingguy.varnish - name: geerlingguy.firewall - name: geerlingguy.composer diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml index 1fa32e471..cf864378f 100644 --- a/roles/gitlab/defaults/main.yml +++ b/roles/gitlab/defaults/main.yml @@ -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 diff --git a/roles/gitlab/templates/gitlab.rb.j2 b/roles/gitlab/templates/gitlab.rb.j2 index 29588f0c1..b5ffaa8bd 100644 --- a/roles/gitlab/templates/gitlab.rb.j2 +++ b/roles/gitlab/templates/gitlab.rb.j2 @@ -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' @@ -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' @@ -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'] = { From aba5cff0389a4838bc91f7490aff476684aedab7 Mon Sep 17 00:00:00 2001 From: gregharvey Date: Mon, 17 Jan 2022 12:43:12 +0100 Subject: [PATCH 2/2] Booleans to use in jinja2 as strings must be cast as strings. --- roles/gitlab/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml index cf864378f..dd004aeb5 100644 --- a/roles/gitlab/defaults/main.yml +++ b/roles/gitlab/defaults/main.yml @@ -19,9 +19,9 @@ gitlab: 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 + 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