Skip to content

Commit 3e932c6

Browse files
gregharveyEmlynK
andauthored
Prometheus pr devel (#531)
* Need to check if is_local is defined in webserver meta dependencies. (#522) * Ce dev refactor pr 1.x (#518) * Making it easier to test with provision-target and ce-dev. * Moving the provision forcing var back to plays so _init has it. * Adding defaults vars and test script extra options. * Adding a web server test to CI. * examples string needs to be in quotes. * Making sure is_local and _ce_provision_force_play are available to the _init role. * Adding SSH keys to the provision user. * Adding a --force to the test script. * Explicitly adding vars to role. * Fixing _init behaviour and adding SSH key for web role. * Setting default PHP version to 7.4. * Looking up the generated ce-dev SSH key instead of hard-coding one. * We cannot run the ssh_server role locally, so excluding for tests of webserver role. * Trying to remove user_root.yml in case it's breaking CI. * Adding a verbose mode to the test script. * Exposing the command in the test script. * Trying hard-coded keys again. * Changing location of data dir for test containers. * Putting vars back and restricting CI to the 'web' example. * Adding backup handling to ldap_server. (#525) * Adding backup handling to ldap_server. * Improving SSL docs and handling perms for openldap and letsencrypt. * Cron user must be specified with file. * Running as root, do not need a 'sudo' in this cron. * Allowing 'gitLab' to disable Prometheus. * Booleans to use in jinja2 as strings must be cast as strings. Co-authored-by: EmlynK <emlyn.kinzett@codeenigma.com>
1 parent 7c70c69 commit 3e932c6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

roles/gitlab/defaults/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ gitlab:
1919
ldap_lookup_base: "{{ ldap_client.lookup_base }}"
2020
ldap_binddn: "{{ ldap_client.binddn }}"
2121
ldap_bindpw: "{{ ldap_client.bindpw }}"
22-
prometheus: true # enable/disable built-in Prometheus
23-
node_exporter: true # enable/disable built-in Prometheus Node Exporter
24-
alertmanager: true # enable/disable built-in Prometheus Alertmanager
22+
prometheus: "true" # enable/disable built-in Prometheus
23+
node_exporter: "true" # enable/disable built-in Prometheus Node Exporter
24+
alertmanager: "true" # enable/disable built-in Prometheus Alertmanager
2525
nginx:
2626
listen_port: 8881
2727
listen_https: nil

0 commit comments

Comments
 (0)